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

fix merge issue in previous
---

diff --git a/ext/standard/dns.c b/ext/standard/dns.c
index 7d17006997..ca740e7b78 100644
--- a/ext/standard/dns.c
+++ b/ext/standard/dns.c
@@ -535,7 +535,7 @@ static u_char *php_parserr(u_char *cp, u_char *end, querybuf *answer, int type_t
 					}
 					if (n) {
 						memcpy(tp->val + l2 , cp + l1 + 1, n);
-						add_next_index_stringl(entries, cp + l1 + 1, n, 1);
+						add_next_index_stringl(&entries, cp + l1 + 1, n);
 					}
 					l1 = l1 + n + 1;
 					l2 = l2 + n;