Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3: Fix bug #64458 (dns_get_record result with string of length -1)
php · Apr 24, 2013 · f87d2ab · f87d2ab
2 parents 43ab915 + 18fdab5
commit f87d2ab
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/ext/standard/dns.c b/ext/standard/dns.c
@@ -524,7 +524,7 @@ static u_char *php_parserr(u_char *cp, querybuf *answer, int type_to_fetch, int
 				tp[dlen] = '\0';
 				cp += dlen;
 
-				add_assoc_stringl(*subarray, "txt", tp, dlen - 1, 0);
+				add_assoc_stringl(*subarray, "txt", tp, (dlen>0)?dlen - 1:0, 0);
 				add_assoc_zval(*subarray, "entries", entries);
 			}
 			break;