com php-src: fix merge issue in previous (again): ext/standard/dns.c
| From: | Remi Collet | Date: | Tue, 19 Aug 2014 07:16:24 +0000 |
| Subject: | com php-src: fix merge issue in previous (again): ext/standard/dns.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-80601@lists.php.net to get a copy of this message | ||
Commit: 633cc42018d863087be2bafd554d586004f949ee
Author: Remi Collet <remi@php.net> Tue, 19 Aug 2014 09:16:24 +0200
Parents: ddd1e2a8b75f652d3a8932b8f3ede709bf30e3ce
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=633cc42018d863087be2bafd554d586004f949ee
Log:
fix merge issue in previous (again)
Changed paths:
M ext/standard/dns.c
Diff:
diff --git a/ext/standard/dns.c b/ext/standard/dns.c
index ca740e7..06df385 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);