com php-src: Fix potential segfault in dns_get_record() : ext/standard/dns.c
| From: | Sara Golemon | Date: | Wed, 11 Jun 2014 20:37:04 +0000 |
| Subject: | com php-src: Fix potential segfault in dns_get_record() : ext/standard/dns.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-78843@lists.php.net to get a copy of this message | ||
Commit: 4f73394fdd95d3165b4391e1b0dedd57fced8c3b
Author: Sara Golemon <pollita@php.net> Tue, 10 Jun 2014 11:18:02 -0700
Parents: 317bcb96d01a1dade28f2875bdd9bbbf73a40160
Branches: PHP-5.4 PHP-5.5 PHP-5.6 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=4f73394fdd95d3165b4391e1b0dedd57fced8c3b
Log:
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.
Changed paths:
M ext/standard/dns.c
Diff:
diff --git a/ext/standard/dns.c b/ext/standard/dns.c
index 6a89446..214a7dc 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;