com php-src: Fixed complier error: ext/iconv/iconv.c
| From: | Xinchen Hui | Date: | Fri, 22 Aug 2014 02:20:44 +0000 |
| Subject: | com php-src: Fixed complier error: ext/iconv/iconv.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-80686@lists.php.net to get a copy of this message | ||
Commit: da35db3ec5fc4b27087292c067a6ea1d0f77bf8f
Author: Xinchen Hui <laruence@php.net> Fri, 22 Aug 2014 10:20:44 +0800
Parents: 7fca659a7bd73a62c1f46ad04de995a6bfa1c994
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=da35db3ec5fc4b27087292c067a6ea1d0f77bf8f
Log:
Fixed complier error
Changed paths:
M ext/iconv/iconv.c
Diff:
diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c
index 39c5b31..3b9998e 100644
--- a/ext/iconv/iconv.c
+++ b/ext/iconv/iconv.c
@@ -596,7 +596,7 @@ PHP_ICONV_API php_iconv_err_t php_iconv_string(const char *in_p, size_t in_len,
}
if (out_left < 8) {
- size_t pos = out_p - out_buffer;
+ size_t pos = out_p - out_buffer->val;
out_buffer = STR_REALLOC(out_buffer, out_size + 8, 0);
out_p = out_buffer->val + pos;
out_size += 7;