From 633cc42018d863087be2bafd554d586004f949ee Mon Sep 17 00:00:00 2001 From: Remi Collet Date: Tue, 19 Aug 2014 09:16:24 +0200 Subject: [PATCH] fix merge issue in previous (again) --- ext/standard/dns.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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); -- 2.40.0