diff options
Diffstat (limited to 'Zend/zend_multibyte.c')
| -rw-r--r-- | Zend/zend_multibyte.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Zend/zend_multibyte.c b/Zend/zend_multibyte.c index 75fcd638d2..49056cfad4 100644 --- a/Zend/zend_multibyte.c +++ b/Zend/zend_multibyte.c @@ -114,7 +114,7 @@ ZEND_API int zend_multibyte_set_functions(const zend_multibyte_functions *functi * populated, we need to reinitialize script_encoding here. */ { - const char *value = zend_ini_string("zend.script_encoding", sizeof("zend.script_encoding"), 0); + const char *value = zend_ini_string("zend.script_encoding", sizeof("zend.script_encoding") - 1, 0); zend_multibyte_set_script_encoding_by_string(value, strlen(value) TSRMLS_CC); } return SUCCESS; @@ -168,7 +168,7 @@ ZEND_API const zend_encoding *zend_multibyte_get_script_encoding(TSRMLS_D) ZEND_API int zend_multibyte_set_script_encoding(const zend_encoding **encoding_list, size_t encoding_list_size TSRMLS_DC) { if (CG(script_encoding_list)) { - free(CG(script_encoding_list)); + free((char*)CG(script_encoding_list)); } CG(script_encoding_list) = encoding_list; CG(script_encoding_list_size) = encoding_list_size; @@ -195,7 +195,7 @@ ZEND_API int zend_multibyte_set_script_encoding_by_string(const char *new_value, } if (size == 0) { - pefree(list, 1); + pefree((void*)list, 1); return FAILURE; } |