From: Andrei Zmievski <andrei@php.net>
Date: Wed, 20 Dec 2006 20:43:52 +0000 (+0000)
Subject: Check for conversion failure in "s&" and return appropriately.
X-Git-Tag: RELEASE_1_0_0RC1~606
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=de0f972b2bbfff1a0f2b97e82d57df7582bd0c06;p=php

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

diff --git a/Zend/zend_API.c b/Zend/zend_API.c
index 6de92e8eca..7aad13e0b6 100644
--- 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;