stas Wed Sep 12 21:21:18 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/ext/pdo pdo_stmt.c
Log:
fix crash if stream is empty and reader function sets buffer as null
http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo_stmt.c?r1=1.118.2.38.2.23&r2=1.118.2.38.2.24&diff_format=u
Index: php-src/ext/pdo/pdo_stmt.c
diff -u php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.23
php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.24
--- php-src/ext/pdo/pdo_stmt.c:1.118.2.38.2.23 Thu Aug 30 14:06:12 2007
+++ php-src/ext/pdo/pdo_stmt.c Wed Sep 12 21:21:18 2007
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: pdo_stmt.c,v 1.118.2.38.2.23 2007/08/30 14:06:12 bjori Exp $ */
+/* $Id: pdo_stmt.c,v 1.118.2.38.2.24 2007/09/12 21:21:18 stas Exp $ */
/* The PDO Statement Handle Class */
@@ -569,7 +569,11 @@
char *buf = NULL;
size_t len;
len =
php_stream_copy_to_mem((php_stream*)value, &buf, PHP_STREAM_COPY_ALL, 0);
- ZVAL_STRINGL(dest, buf, len, 0);
+ if(buf == NULL) {
+ ZVAL_EMPTY_STRING(dest);
+ } else {
+ ZVAL_STRINGL(dest, buf, len, 0);
+ }
php_stream_close((php_stream*)value);
} else {
php_stream_to_zval((php_stream*)value,
dest);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
