pyrox.dev
glibc: fix cve-2015-7547.patch so it applies cleanly
+6
-2
pkgs/development/libraries/glibc/cve-2015-7547.patch
+6
-2
pkgs/development/libraries/glibc/cve-2015-7547.patch
···
316
316
- // int anssiz = *anssizp;
317
317
- HEADER *anhp = (HEADER *) ans;
318
318
+ HEADER *anhp = (HEADER *) *ansp;
319
-
struct sockaddr *nsap = get_nsaddr (statp, ns);
319
+
struct sockaddr_in6 *nsap = EXT(statp).nsaddrs[ns];
320
320
int truncating, connreset, n;
321
321
/* On some architectures compiler might emit a warning indicating
322
322
@@ -731,6 +817,8 @@ send_vc(res_state statp,
···
328
328
int recvresp2 = buf2 == NULL;
329
329
uint16_t rlen16;
330
330
read_len:
331
-
@@ -767,36 +855,14 @@ send_vc(res_state statp,
331
+
@@ -767,40 +855,14 @@ send_vc(res_state statp,
332
332
u_char **thisansp;
333
333
int *thisresplenp;
334
334
if ((recvresp1 | recvresp2) == 0 || buf2 == NULL) {
···
344
344
- /* No buffer allocated for the first
345
345
- reply. We can try to use the rest
346
346
- of the user-provided buffer. */
347
+
-#if __GNUC_PREREQ (4, 7)
347
348
- DIAG_PUSH_NEEDS_COMMENT;
348
349
- DIAG_IGNORE_NEEDS_COMMENT (5, "-Wmaybe-uninitialized");
350
+
-#endif
349
351
-#if _STRING_ARCH_unaligned
350
352
- *anssizp2 = orig_anssizp - resplen;
351
353
- *ansp2 = *ansp + resplen;
···
356
358
- *anssizp2 = orig_anssizp - aligned_resplen;
357
359
- *ansp2 = *ansp + aligned_resplen;
358
360
-#endif
361
+
-#if __GNUC_PREREQ (4, 7)
359
362
- DIAG_POP_NEEDS_COMMENT;
363
+
-#endif
360
364
- } else {
361
365
- /* The first reply did not fit into the
362
366
- user-provided buffer. Maybe the second