From 140d99b467e5bfd62ac9f1ee09b75cf6f7f0393d Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Mon, 15 Sep 2014 10:51:56 +0200 Subject: [PATCH 1/4] fix condition --- ext/iconv/iconv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c index 1803266c338..d27270ece98 100644 --- a/ext/iconv/iconv.c +++ b/ext/iconv/iconv.c @@ -2076,7 +2076,7 @@ PHP_FUNCTION(iconv_substr) err = _php_iconv_substr(&retval, str->val, str->len, offset, length, charset); _php_iconv_show_error(err, GENERIC_SUPERSET_NAME, charset TSRMLS_CC); - if (err == PHP_ICONV_ERR_SUCCESS && str->val != NULL && retval.s != NULL) { + if (err == PHP_ICONV_ERR_SUCCESS && str->val[0] != '\0' && retval.s != NULL) { RETURN_STR(retval.s); } smart_str_free(&retval); From e056d52acff01a80f6ab9dbff1256320c8c47062 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Mon, 15 Sep 2014 10:57:04 +0200 Subject: [PATCH 2/4] fix type --- ext/iconv/iconv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c index d27270ece98..19270a55b94 100644 --- a/ext/iconv/iconv.c +++ b/ext/iconv/iconv.c @@ -415,7 +415,7 @@ static int php_iconv_output_handler(void **nothing, php_output_context *output_c } if (mimetype != NULL && !(output_context->op & PHP_OUTPUT_HANDLER_CLEAN)) { - zend_long len; + size_t len; char *p = strstr(get_output_encoding(TSRMLS_C), "//"); if (p) { From 4c496a7f5b65228b2afbe3399cf9d692168796f8 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Mon, 15 Sep 2014 11:13:55 +0200 Subject: [PATCH 3/4] fix signature --- ext/com_dotnet/php_com_dotnet_internal.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/com_dotnet/php_com_dotnet_internal.h b/ext/com_dotnet/php_com_dotnet_internal.h index f1538830061..43c208f9cb5 100644 --- a/ext/com_dotnet/php_com_dotnet_internal.h +++ b/ext/com_dotnet/php_com_dotnet_internal.h @@ -104,7 +104,7 @@ PHP_FUNCTION(com_get_active_object); HRESULT php_com_invoke_helper(php_com_dotnet_object *obj, DISPID id_member, WORD flags, DISPPARAMS *disp_params, VARIANT *v, int silent, int allow_noarg TSRMLS_DC); HRESULT php_com_get_id_of_name(php_com_dotnet_object *obj, char *name, - int namelen, DISPID *dispid TSRMLS_DC); + size_t namelen, DISPID *dispid TSRMLS_DC); int php_com_do_invoke_by_id(php_com_dotnet_object *obj, DISPID dispid, WORD flags, VARIANT *v, int nargs, zval *args, int silent, int allow_noarg TSRMLS_DC); int php_com_do_invoke(php_com_dotnet_object *obj, char *name, int namelen, From f595ed4b8c1a6e5b95df6e2ad444816186878995 Mon Sep 17 00:00:00 2001 From: Anatol Belski Date: Mon, 15 Sep 2014 11:28:24 +0200 Subject: [PATCH 4/4] fix initializer struct --- Zend/zend_execute_API.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index 7842ecfb918..09519d70838 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -42,7 +42,7 @@ ZEND_API void (*zend_execute_ex)(zend_execute_data *execute_data TSRMLS_DC); ZEND_API void (*zend_execute_internal)(zend_execute_data *execute_data, zval *return_value TSRMLS_DC); /* true globals */ -ZEND_API const zend_fcall_info empty_fcall_info = { 0, NULL, {{0}, {{0}}, {0}}, NULL, NULL, 0, NULL, NULL, 0 }; +ZEND_API const zend_fcall_info empty_fcall_info = { 0, NULL, {{0}, {{0}}, {0}}, NULL, NULL, NULL, NULL, 0, 0 }; ZEND_API const zend_fcall_info_cache empty_fcall_info_cache = { 0, NULL, NULL, NULL, NULL }; #ifdef ZEND_WIN32