cvs: php3 /functions string.c
| From: | Sascha Schumann | Date: | Sun, 17 Dec 2000 02:14:44 +0000 |
| Subject: | cvs: php3 /functions string.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-3193@lists.php.net to get a copy of this message | ||
sas Sat Dec 16 18:14:44 2000 EDT
Modified files:
/php3/functions string.c
Log:
Merge fix for empty strings passed to strtr
Index: php3/functions/string.c
diff -u php3/functions/string.c:1.215 php3/functions/string.c:1.216
--- php3/functions/string.c:1.215 Fri Sep 29 02:06:28 2000
+++ php3/functions/string.c Sat Dec 16 18:14:44 2000
@@ -30,7 +30,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: string.c,v 1.215 2000/09/29 09:06:28 rasmus Exp $ */
+/* $Id: string.c,v 1.216 2000/12/17 02:14:44 sas Exp $ */
#include <stdio.h>
#include "php.h"
#include "internal_functions.h"
@@ -1119,6 +1119,9 @@
convert_to_string(str);
convert_to_string(from);
convert_to_string(to);
+
+ if (str->value.str.len == 0)
+ RETURN_STRINGL(empty_string, 0, 0);
RETVAL_STRING(_php3_strtr(str->value.str.val,
str->value.str.len,