Blame glibc-gethnamaddr-gcc5.patch
|
Carlos O'Donell |
fe4ad2a |
Index: glibc-2.23-276-gb65b205/resolv/gethnamaddr.c
|
|
Carlos O'Donell |
0457f64 |
===================================================================
|
|
Carlos O'Donell |
fe4ad2a |
--- glibc-2.23-276-gb65b205.orig/resolv/gethnamaddr.c
|
|
Carlos O'Donell |
fe4ad2a |
+++ glibc-2.23-276-gb65b205/resolv/gethnamaddr.c
|
|
Carlos O'Donell |
fe4ad2a |
@@ -68,6 +68,7 @@
|
|
Carlos O'Donell |
0457f64 |
#include <errno.h>
|
|
Carlos O'Donell |
fe4ad2a |
#include <stdlib.h>
|
|
Carlos O'Donell |
fe4ad2a |
#include <string.h>
|
|
Carlos O'Donell |
0457f64 |
+#include <libc-internal.h>
|
|
Carlos O'Donell |
0457f64 |
|
|
Carlos O'Donell |
fe4ad2a |
#define MAXALIASES 35
|
|
Carlos O'Donell |
fe4ad2a |
#define MAXADDRS 35
|
|
Carlos O'Donell |
fe4ad2a |
@@ -864,10 +865,19 @@ addrsort (char **ap, int num)
|
|
Carlos O'Donell |
0457f64 |
|
|
Carlos O'Donell |
0457f64 |
p = ap;
|
|
Carlos O'Donell |
0457f64 |
for (i = 0; i < num; i++, p++) {
|
|
Carlos O'Donell |
0457f64 |
+ DIAG_PUSH_NEEDS_COMMENT
|
|
Carlos O'Donell |
0457f64 |
+#if __GNUC_PREREQ (5, 0)
|
|
Carlos O'Donell |
0457f64 |
+ /* GCC 5.0 warns about array subscript being above array bounds,
|
|
Carlos O'Donell |
0457f64 |
+ but that's not entirely possible since i is limited to
|
|
Carlos O'Donell |
0457f64 |
+ _res.nsort which is limited to MAXRESOLVSORT. This
|
|
Carlos O'Donell |
0457f64 |
+ is likely PR/59124 which is still not fixed. */
|
|
Carlos O'Donell |
0457f64 |
+ DIAG_IGNORE_NEEDS_COMMENT (5.0, "-Warray-bounds")
|
|
Carlos O'Donell |
0457f64 |
+#endif
|
|
Carlos O'Donell |
0457f64 |
for (j = 0 ; (unsigned)j < _res.nsort; j++)
|
|
Carlos O'Donell |
0457f64 |
if (_res.sort_list[j].addr.s_addr ==
|
|
Carlos O'Donell |
0457f64 |
(((struct in_addr *)(*p))->s_addr & _res.sort_list[j].mask))
|
|
Carlos O'Donell |
0457f64 |
break;
|
|
Carlos O'Donell |
0457f64 |
+ DIAG_POP_NEEDS_COMMENT
|
|
Carlos O'Donell |
0457f64 |
aval[i] = j;
|
|
Carlos O'Donell |
0457f64 |
if (needsort == 0 && i > 0 && j < aval[i-1])
|
|
Carlos O'Donell |
0457f64 |
needsort = i;
|