diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-06-24 17:45:18 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-06-24 17:45:18 -0300 |
| commit | 1d281894276f404075d12ab90cdc3dbff7a89cd2 (patch) | |
| tree | 609da5609f9606a1d061c6a1b8fa9d8efc02446e /multilib-testing/lib32-glibc/glibc-2.14-fix-resolver-crash-typo.patch | |
| parent | 905d4583b1cbf6ee0bca36a3c8bebf6552b4cf38 (diff) | |
| parent | 7347bb994a41d021c83e97b503f577f2399302e7 (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/collectd/PKGBUILD
extra/ffmpeg/PKGBUILD
extra/xulrunner/PKGBUILD
Diffstat (limited to 'multilib-testing/lib32-glibc/glibc-2.14-fix-resolver-crash-typo.patch')
| -rw-r--r-- | multilib-testing/lib32-glibc/glibc-2.14-fix-resolver-crash-typo.patch | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/multilib-testing/lib32-glibc/glibc-2.14-fix-resolver-crash-typo.patch b/multilib-testing/lib32-glibc/glibc-2.14-fix-resolver-crash-typo.patch new file mode 100644 index 000000000..b5d86c7d2 --- /dev/null +++ b/multilib-testing/lib32-glibc/glibc-2.14-fix-resolver-crash-typo.patch @@ -0,0 +1,22 @@ +diff --git a/resolv/res_send.c b/resolv/res_send.c +index 97142b7..a001c1e 100644 +--- a/resolv/res_send.c ++++ b/resolv/res_send.c +@@ -549,7 +549,7 @@ __libc_res_nsend(res_state statp, const u_char *buf, int buflen, + ns, ansp, ansp2, nansp2, resplen2); + if (n < 0) + return (-1); +- if (n == 0 && (buf2 == NULL || resplen2 == 0)) ++ if (n == 0 && (buf2 == NULL || *resplen2 == 0)) + goto next_ns; + } else { + /* Use datagrams. */ +@@ -559,7 +559,7 @@ __libc_res_nsend(res_state statp, const u_char *buf, int buflen, + ansp2, nansp2, resplen2); + if (n < 0) + return (-1); +- if (n == 0 && (buf2 == NULL || resplen2 == 0)) ++ if (n == 0 && (buf2 == NULL || *resplen2 == 0)) + goto next_ns; + if (v_circuit) + // XXX Check whether both requests failed or |