Check for conversion failure in "s&" and return appropriately.

diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index 6de92e8eca56c338fa347930a4a0f3a2b2bc9eb1..7aad13e0b6d89fda0939bbfdc2ded82ba31f60f1 100644 (file)
--- a/Zend/zend_API.c
+++ b/Zend/zend_API.c
@@ -456,7 +456,9 @@ static char *zend_parse_arg_impl(int arg_num, zval **arg, va_list *va, char **sp
                                                /* handle conversion of Unicode to binary with a specific converter */
                                                if (conv != NULL) {
                                                        SEPARATE_ZVAL_IF_NOT_REF(arg);
-                                                       convert_to_string_with_converter(*arg, conv);
+                                                       if (convert_to_string_with_converter(*arg, conv) == FAILURE) {
+                                                               return "";
+                                                       }
                                                        *p = Z_STRVAL_PP(arg);
                                                        *pl = Z_STRLEN_PP(arg);
                                                        break;