Merge branch 'PHP-5.6'

* PHP-5.6: Fix potential segfault in dns_get_record()
php · Jun 11, 2014 · b34d784 · b34d784
2 parents ec974c4 + e2ef56f
commit b34d784
Showing 1 changed file with 4 additions and 0 deletions.
diff --git 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;