com php-src: fixed UConverter::convert(): ext/intl/converter/converter.c
| From: | Anatol Belski | Date: | Wed, 27 Aug 2014 21:03:58 +0000 |
| Subject: | com php-src: fixed UConverter::convert(): ext/intl/converter/converter.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-81227@lists.php.net to get a copy of this message | ||
Commit: 0e41927ca091fa0e421c5fa8734f219343c2ae34
Author: Anatol Belski <ab@php.net> Wed, 27 Aug 2014 23:03:58 +0200
Parents: a1a4a6101c2fb3e1629ae7f554f847261f416e2b
Branches: master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=0e41927ca091fa0e421c5fa8734f219343c2ae34
Log:
fixed UConverter::convert()
Changed paths:
M ext/intl/converter/converter.c
Diff:
diff --git a/ext/intl/converter/converter.c b/ext/intl/converter/converter.c
index 54314e2...887c404 100644
--- a/ext/intl/converter/converter.c
+++ b/ext/intl/converter/converter.c
@@ -764,7 +764,8 @@ ZEND_END_ARG_INFO();
static PHP_METHOD(UConverter, convert) {
php_converter_object *objval = CONV_GET(getThis());
char *str, *dest;
- size_t str_len, dest_len;
+ size_t str_len;
+ int32_t dest_len;
zend_bool reverse = 0;
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|b",
@@ -776,7 +777,7 @@ static PHP_METHOD(UConverter, convert) {
intl_errors_reset(&objval->error TSRMLS_CC);
if (php_converter_do_convert(reverse ? objval->src : objval->dest,
- &dest, (int32_t *)&dest_len,
+ &dest, &dest_len,
reverse ? objval->dest : objval->src,
str, str_len,
objval TSRMLS_CC)) {