cvs: php-src(PHP_5_2) /ext/standard string.c
| From: | Antony Dovgal | Date: | Wed, 20 Dec 2006 23:30:30 +0000 |
| Subject: | cvs: php-src(PHP_5_2) /ext/standard string.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-42239@lists.php.net to get a copy of this message | ||
tony2001 Wed Dec 20 23:30:30 2006 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/standard string.c
Log:
MFH
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/string.c?r1=1.445.2.14.2.33&r2=1.445.2.14.2.34&diff_format=u
Index: php-src/ext/standard/string.c
diff -u php-src/ext/standard/string.c:1.445.2.14.2.33 php-src/ext/standard/string.c:1.445.2.14.2.34
--- php-src/ext/standard/string.c:1.445.2.14.2.33 Mon Dec 18 15:02:16 2006
+++ php-src/ext/standard/string.c Wed Dec 20 23:30:30 2006
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: string.c,v 1.445.2.14.2.33 2006/12/18 15:02:16 iliaa Exp $ */
+/* $Id: string.c,v 1.445.2.14.2.34 2006/12/20 23:30:30 tony2001 Exp $ */
/* Synced with php 3.0 revision 1.193 1999-06-16 [ssb] */
@@ -1235,11 +1235,11 @@
}
len = cend - comp;
- ret = emalloc(len + 1);
- memcpy(ret, comp, len);
- ret[len] = '\0';
if (p_ret) {
+ ret = emalloc(len + 1);
+ memcpy(ret, comp, len);
+ ret[len] = '\0';
*p_ret = ret;
}
if (p_len) {