Attachment #75057 for bug #108472

View | Details | Raw Unified | Return to bug 108472
Collapse All | Expand All

Lines 7-13 Link Here

(-)php5.new/Makefile (-1 / +1 lines)
7		7
8	PORTNAME= php5	8	PORTNAME= php5
9	PORTVERSION= 5.2.0	9	PORTVERSION= 5.2.0
10	PORTREVISION?= 0	10	PORTREVISION?= 1
11	CATEGORIES?= lang devel www	11	CATEGORIES?= lang devel www
12	MASTER_SITES= ${MASTER_SITE_PHP:S,$,:release,} \	12	MASTER_SITES= ${MASTER_SITE_PHP:S,$,:release,} \
13	http://downloads.php.net/ilia/:rc \	13	http://downloads.php.net/ilia/:rc \




--- ext/standard/string.c	2006/10/11 14:19:55	1.445.2.14.2.27
+++ ext/standard/string.c	2006/11/06 17:21:05	1.445.2.14.2.28
@@ -955,7 +955,12 @@
 	}
 	smart_str_0(&implstr);
 
-	RETURN_STRINGL(implstr.c, implstr.len, 0);
+	if (implstr.len) {
+		RETURN_STRINGL(implstr.c, implstr.len, 0);
+	} else {
+		smart_str_free(&implstr);
+		RETURN_EMPTY_STRING();
+	}
 }
 /* }}} */


Return to bug 108472

Line 0 Link Here

(-)php5.new/files/patch-ext_standard_string.c (+16 lines)
	1	--- ext/standard/string.c 2006/10/11 14:19:55 1.445.2.14.2.27
	2	+++ ext/standard/string.c 2006/11/06 17:21:05 1.445.2.14.2.28
	3	@@ -955,7 +955,12 @@
	4	}
	5	smart_str_0(&implstr);
	6
	7	- RETURN_STRINGL(implstr.c, implstr.len, 0);
	8	+ if (implstr.len) {
	9	+ RETURN_STRINGL(implstr.c, implstr.len, 0);
	10	+ } else {
	11	+ smart_str_free(&implstr);
	12	+ RETURN_EMPTY_STRING();
	13	+ }
	14	}
	15	/* }}} */
	16