From: Andrei Zmievski <andrei@php.net>
Date: Sat, 10 Nov 2001 23:44:04 +0000 (+0000)
Subject: Fixed bug #13901.
X-Git-Tag: ChangeLog~365
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=98a7a1ba1f347cb9e2971275bfa4746251ef33c9;p=php

Fixed bug #13901.
---

diff --git a/ext/standard/string.c b/ext/standard/string.c
index ad52790740..5bfd12175f 100644
--- a/ext/standard/string.c
+++ b/ext/standard/string.c
@@ -2650,6 +2650,7 @@ static void php_str_replace_in_subject(zval *search, zval *replace, zval **subje
 		/* Duplicate subject string for repeated replacement */
 		*result = **subject;
 		zval_copy_ctor(result);
+		INIT_PZVAL(result);
 		
 		zend_hash_internal_pointer_reset(Z_ARRVAL_P(search));
 
@@ -2698,14 +2699,18 @@ static void php_str_replace_in_subject(zval *search, zval *replace, zval **subje
 								&temp_result);
 			} else if (Z_STRLEN_PP(search_entry) > 1) {
 				Z_STRVAL(temp_result) = str_to_str(Z_STRVAL_P(result), Z_STRLEN_P(result),
-													   Z_STRVAL_PP(search_entry), Z_STRLEN_PP(search_entry),
-													   replace_value, replace_len, &Z_STRLEN(temp_result));
+												   Z_STRVAL_PP(search_entry), Z_STRLEN_PP(search_entry),
+												   replace_value, replace_len, &Z_STRLEN(temp_result));
 			}
 
 			efree(Z_STRVAL_P(result));
 			Z_STRVAL_P(result) = Z_STRVAL(temp_result);
 			Z_STRLEN_P(result) = Z_STRLEN(temp_result);
 
+			if (Z_STRLEN_P(result) == 0) {
+				return;
+			}
+
 			zend_hash_move_forward(Z_ARRVAL_P(search));
 		}
 	} else {
@@ -2718,11 +2723,12 @@ static void php_str_replace_in_subject(zval *search, zval *replace, zval **subje
 							result);
 		} else if (Z_STRLEN_P(search) > 1) {
 			Z_STRVAL_P(result) = str_to_str(Z_STRVAL_PP(subject), Z_STRLEN_PP(subject),
-												Z_STRVAL_P(search), Z_STRLEN_P(search),
-												Z_STRVAL_P(replace), Z_STRLEN_P(replace), &Z_STRLEN_P(result));
+											Z_STRVAL_P(search), Z_STRLEN_P(search),
+											Z_STRVAL_P(replace), Z_STRLEN_P(replace), &Z_STRLEN_P(result));
 		} else {
 			*result = **subject;
 			zval_copy_ctor(result);
+			INIT_PZVAL(result);
 		}
 	}
 }
@@ -2740,9 +2746,9 @@ PHP_FUNCTION(str_replace)
 	int boyer = 0;
 
 	if(ZEND_NUM_ARGS() < 3 ||
-			ZEND_NUM_ARGS() > 4 ||
-			zend_get_parameters_ex(ZEND_NUM_ARGS(), &search, 
-				&replace, &subject, &pboyer) == FAILURE) {
+	   ZEND_NUM_ARGS() > 4 ||
+	   zend_get_parameters_ex(ZEND_NUM_ARGS(), &search, 
+							  &replace, &subject, &pboyer) == FAILURE) {
 		WRONG_PARAM_COUNT;
 	}