summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRemi Collet <remi@php.net>2014-08-19 09:10:34 +0200
committerRemi Collet <remi@php.net>2014-08-19 09:10:34 +0200
commitddd1e2a8b75f652d3a8932b8f3ede709bf30e3ce (patch)
tree018ee3b718679d589658c79972c0910b3ff003de
parent14e656f81d12677d69d5faec6a8d19e7e056297c (diff)
downloadphp-git-ddd1e2a8b75f652d3a8932b8f3ede709bf30e3ce.tar.gz
fix merge issue in previous
-rw-r--r--ext/standard/dns.c2
1 files changed, 1 insertions, 1 deletions
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;