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