diff options
| author | Sara Golemon <pollita@php.net> | 2014-06-10 11:18:02 -0700 |
|---|---|---|
| committer | Sara Golemon <pollita@php.net> | 2014-06-11 13:37:04 -0700 |
| commit | 4f73394fdd95d3165b4391e1b0dedd57fced8c3b (patch) | |
| tree | d86948858323148770aeef8e0ffd2f664f6f0109 /ext/standard | |
| parent | 317bcb96d01a1dade28f2875bdd9bbbf73a40160 (diff) | |
| download | php-git-4f73394fdd95d3165b4391e1b0dedd57fced8c3b.tar.gz | |
Fix potential segfault in dns_get_record()
If the remote sends us a packet with a malformed TXT record,
we could end up trying to over-consume the packet and wander
off into overruns.
Diffstat (limited to 'ext/standard')
| -rw-r--r-- | ext/standard/dns.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ext/standard/dns.c b/ext/standard/dns.c index 6a894467ff..214a7dc7e9 100644 --- a/ext/standard/dns.c +++ b/ext/standard/dns.c @@ -517,6 +517,10 @@ static u_char *php_parserr(u_char *cp, querybuf *answer, int type_to_fetch, int while (ll < dlen) { n = cp[ll]; + if ((ll + n) >= dlen) { + // Invalid chunk length, truncate + n = dlen - (ll + 1); + } memcpy(tp + ll , cp + ll + 1, n); add_next_index_stringl(entries, cp + ll + 1, n, 1); ll = ll + n + 1; |