From: Stanislav Malyshev <stas@php.net>
Date: Wed, 12 Sep 2007 21:27:56 +0000 (+0000)
Subject: MFB: fix crash if stream is empty and reader function sets buffer as null
X-Git-Tag: RELEASE_2_0_0a1~1828
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=88a97c56dd2dac5636a381c9e47d4fe08d1f3a84;p=php

MFB: fix crash if stream is empty and reader function sets buffer as null
---

diff --git a/ext/pdo/pdo_stmt.c b/ext/pdo/pdo_stmt.c
index 0d3fa92dc2..9558621593 100755
--- a/ext/pdo/pdo_stmt.c
+++ b/ext/pdo/pdo_stmt.c
@@ -538,7 +538,11 @@ static inline void fetch_value(pdo_stmt_t *stmt, zval *dest, int colno, int *typ
 					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);