cvs: php-src /main main.c
| From: | Ilia Alshanetsky | Date: | Fri, 28 May 2004 14:14:26 +0000 |
| Subject: | cvs: php-src /main main.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-27493@lists.php.net to get a copy of this message | ||
iliaa Fri May 28 10:14:26 2004 EDT
Modified files:
/php-src/main main.c
Log:
The engine will take care out-of-memory situation for us.
http://cvs.php.net/diff.php/php-src/main/main.c?r1=1.603&r2=1.604&ty=u
Index: php-src/main/main.c
diff -u php-src/main/main.c:1.603 php-src/main/main.c:1.604
--- php-src/main/main.c:1.603 Sun May 23 12:02:36 2004
+++ php-src/main/main.c Fri May 28 10:14:26 2004
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: main.c,v 1.603 2004/05/23 16:02:36 andi Exp $ */
+/* $Id: main.c,v 1.604 2004/05/28 14:14:26 iliaa Exp $ */
/* {{{ includes
*/
@@ -396,13 +396,8 @@
va_start(args, format);
size = vspprintf(&buffer, 0, format, args);
- if (buffer) {
- ret = PHPWRITE(buffer, size);
- efree(buffer);
- } else {
- php_error_docref(NULL TSRMLS_CC, E_ERROR, "Out of memory");
- ret = 0;
- }
+ ret = PHPWRITE(buffer, size);
+ efree(buffer);
va_end(args);
return ret;