cvs: php-src(PHP_5_1) /ext/standard string.c
| From: | Pierre-Alain Joye | Date: | Sat, 28 Jan 2006 00:14:01 +0000 |
| Subject: | cvs: php-src(PHP_5_1) /ext/standard string.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-36655@lists.php.net to get a copy of this message | ||
pajoye Sat Jan 28 00:14:01 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/ext/standard string.c
Log:
- MFH: #36185 str_rot13(NULL) crash
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/string.c?r1=1.445.2.6&r2=1.445.2.7&diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.445.2.6 php-src/ext/standard/string.c:1.445.2.7
--- php-src/ext/standard/string.c:1.445.2.6 Thu Jan 5 20:49:37 2006
+++ php-src/ext/standard/string.c Sat Jan 28 00:14:01 2006
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: string.c,v 1.445.2.6 2006/01/05 20:49:37 tony2001 Exp $ */
+/* $Id: string.c,v 1.445.2.7 2006/01/28 00:14:01 pajoye Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -4653,6 +4653,8 @@
if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &arg)) {
WRONG_PARAM_COUNT;
}
+
+ convert_to_string_ex(arg);
RETVAL_ZVAL(*arg, 1, 0);
php_strtr(Z_STRVAL_P(return_value), Z_STRLEN_P(return_value), rot13_from, rot13_to, 52);