diff options
| author | Remi Collet <remi@php.net> | 2014-08-19 09:16:24 +0200 | 
|---|---|---|
| committer | Remi Collet <remi@php.net> | 2014-08-19 09:16:24 +0200 | 
| commit | 633cc42018d863087be2bafd554d586004f949ee (patch) | |
| tree | 5233c461443b1142e965e4edd01f5bb178b7c13e /ext | |
| parent | ddd1e2a8b75f652d3a8932b8f3ede709bf30e3ce (diff) | |
| download | php-git-633cc42018d863087be2bafd554d586004f949ee.tar.gz | |
fix merge issue in previous (again)
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/standard/dns.c | 3 | 
1 files changed, 2 insertions, 1 deletions
| diff --git a/ext/standard/dns.c b/ext/standard/dns.c index ca740e7b78..06df38518e 100644 --- a/ext/standard/dns.c +++ b/ext/standard/dns.c @@ -711,8 +711,9 @@ static u_char *php_parserr(u_char *cp, u_char *end, querybuf *answer, int type_t  			CHECKCP(1);  			n = (cp[0] & 0xFF); +			cp++;  			CHECKCP(n); -			add_assoc_stringl(subarray, "flags", (char*)++cp, n); +			add_assoc_stringl(subarray, "flags", (char*)cp, n);  			cp += n;  			CHECKCP(1); | 
