| commit | 8b9c51af0665ba48faa5965064e6033978ce4e33 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Wed Dec 09 18:41:30 2020 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Wed Dec 09 18:41:30 2020 +0000 |
| tree | ce7e4625fa4d945b664c9685bcce2aff37f59dec | |
| parent | 19d5e3d2e72cad75b94403a507263fc30a279e2e [diff] | |
| parent | 12afdf0fa76ebb081769cea2f9dc2961cc04adb9 [diff] |
Merge "Simplify and improve tempnam() and tmpnam()." am: 12afdf0fa7 Original change: https://android-review.googlesource.com/c/platform/bionic/+/1518224 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie3703a300f3378804a30616a7238ecc1cdc20502
diff --git a/libc/dns/resolv/res_send.c b/libc/dns/resolv/res_send.c index a645a6b..fa81e6d 100644 --- a/libc/dns/resolv/res_send.c +++ b/libc/dns/resolv/res_send.c
@@ -948,6 +948,8 @@ else break; } + // return size should never exceed container size + resplen = anssiz; } /* * If the calling applicating has bailed out of @@ -960,7 +962,7 @@ DprintQ((statp->options & RES_DEBUG) || (statp->pfcode & RES_PRF_REPLY), (stdout, ";; old answer (unexpected):\n"), - ans, (resplen > anssiz) ? anssiz: resplen); + ans, resplen); goto read_len; }