From: Remi Collet <remi@php.net>
Date: Tue, 19 Aug 2014 07:16:24 +0000 (+0200)
Subject: fix merge issue in previous (again)
X-Git-Tag: PRE_64BIT_BRANCH_MERGE~37^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=633cc42018d863087be2bafd554d586004f949ee;p=php

fix merge issue in previous (again)
---

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);