diff options
| author | Sara Golemon <pollita@php.net> | 2014-06-11 13:37:40 -0700 |
|---|---|---|
| committer | Sara Golemon <pollita@php.net> | 2014-06-11 13:37:40 -0700 |
| commit | 1978f41c8a8c205421e574e35313f1037c4d5466 (patch) | |
| tree | 9fb4998a6629b20021881c09f865a2a782aca59f | |
| parent | a6e07510792255aab0cd39c01595d16f9da80a05 (diff) | |
| parent | 4f73394fdd95d3165b4391e1b0dedd57fced8c3b (diff) | |
| download | php-git-1978f41c8a8c205421e574e35313f1037c4d5466.tar.gz | |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Fix potential segfault in dns_get_record()
| -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; |