wok-next annotate glibc/stuff/glibc-2.14-revert-4768ae77.patch @ rev 18405
libcanberra: race condition
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Sat Sep 19 09:52:06 2015 +0200 (2015-09-19) |
parents | |
children |
rev | line source |
---|---|
pankso@12269 | 1 diff -Naur glibc-orig//resolv/res_send.c glibc/resolv/res_send.c |
pankso@12269 | 2 --- glibc-orig//resolv/res_send.c 2011-06-10 18:59:03.041436996 +1000 |
pankso@12269 | 3 +++ glibc/resolv/res_send.c 2011-06-10 19:08:09.379309323 +1000 |
pankso@12269 | 4 @@ -549,7 +549,7 @@ |
pankso@12269 | 5 ns, ansp, ansp2, nansp2, resplen2); |
pankso@12269 | 6 if (n < 0) |
pankso@12269 | 7 return (-1); |
pankso@12269 | 8 - if (n == 0 && (buf2 == NULL || *resplen2 == 0)) |
pankso@12269 | 9 + if (n == 0) |
pankso@12269 | 10 goto next_ns; |
pankso@12269 | 11 } else { |
pankso@12269 | 12 /* Use datagrams. */ |
pankso@12269 | 13 @@ -559,7 +559,7 @@ |
pankso@12269 | 14 ansp2, nansp2, resplen2); |
pankso@12269 | 15 if (n < 0) |
pankso@12269 | 16 return (-1); |
pankso@12269 | 17 - if (n == 0 && (buf2 == NULL || *resplen2 == 0)) |
pankso@12269 | 18 + if (n == 0) |
pankso@12269 | 19 goto next_ns; |
pankso@12269 | 20 if (v_circuit) |
pankso@12269 | 21 // XXX Check whether both requests failed or |
pankso@12269 | 22 @@ -1275,14 +1275,10 @@ |
pankso@12269 | 23 (*thisresplenp > *thisanssizp) |
pankso@12269 | 24 ? *thisanssizp : *thisresplenp); |
pankso@12269 | 25 |
pankso@12269 | 26 - if (recvresp1 || (buf2 != NULL && recvresp2)) { |
pankso@12269 | 27 - *resplen2 = 0; |
pankso@12269 | 28 + if (recvresp1 || (buf2 != NULL && recvresp2)) |
pankso@12269 | 29 return resplen; |
pankso@12269 | 30 - } |
pankso@12269 | 31 if (buf2 != NULL) |
pankso@12269 | 32 { |
pankso@12269 | 33 - /* No data from the first reply. */ |
pankso@12269 | 34 - resplen = 0; |
pankso@12269 | 35 /* We are waiting for a possible second reply. */ |
pankso@12269 | 36 if (hp->id == anhp->id) |
pankso@12269 | 37 recvresp1 = 1; |