diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2017-09-21 22:32:42 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-09-21 22:32:42 +0000 |
| commit | 52ee7899666e855cac92441a62782db9fbf0594c (patch) | |
| tree | 22e16721063e5b271cdfa80651455e5636c22139 | |
| parent | a21366fc0529c748068fdd4bfcab48723e2a5f99 (diff) | |
| parent | 9fe87552970cb59cb57f9f9fa058c8824db4306a (diff) | |
| download | dnsmasq-oreo-mr1-wear-release.tar.gz | |
release-request-d1c17d84-f03d-44ed-9e1a-f1dedcc3182d-for-git_oc-mr1-wear-release-4353319 snap-temp-L19800000105061864android-wear-8.1.0_r1oreo-mr1-wear-release
Change-Id: Icd49560ffe127438b3bc8129aef1e2cbc9f88148
| -rwxr-xr-x | src/rfc1035.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/rfc1035.c b/src/rfc1035.c index 8ae0bfa..e440e8a 100755 --- a/src/rfc1035.c +++ b/src/rfc1035.c @@ -48,7 +48,7 @@ static int extract_name(HEADER *header, size_t plen, unsigned char **pp, /* end marker */ { /* check that there are the correct no of bytes after the name */ - if (!CHECK_LEN(header, p, plen, extrabytes)) + if (!CHECK_LEN(header, p1 ? p1 : p, plen, extrabytes)) return 0; if (isExtract) @@ -1142,6 +1142,9 @@ size_t answer_request(HEADER *header, char *limit, size_t qlen, struct crec *crecp; int nxdomain = 0, auth = 1, trunc = 0; struct mx_srv_record *rec; + + // Make sure we do not underflow here too. + if (qlen > (size_t)(limit - ((char *)header))) return 0; /* If there is an RFC2671 pseudoheader then it will be overwritten by partial replies, so we have to do a dry run to see if we can answer |