summaryrefslogtreecommitdiff
path: root/ext/mysqlnd/mysqlnd_ps.c
diff options
context:
space:
mode:
authorXinchen Hui <laruence@gmail.com>2015-11-27 15:52:55 +0800
committerXinchen Hui <laruence@gmail.com>2015-11-27 15:52:55 +0800
commita347b0be48d892c105198b23868f37a0d4f92dee (patch)
tree00ce17d6dae1ca2380c003b1de0a9af8ce1316dd /ext/mysqlnd/mysqlnd_ps.c
parentb0f472b3b2d71d2495d8c4b82a503096691b23b3 (diff)
downloadphp-git-a347b0be48d892c105198b23868f37a0d4f92dee.tar.gz
Fixed bug #70949 (SQL Result Sets With NULL Can Cause Fatal Memory Errors)
Diffstat (limited to 'ext/mysqlnd/mysqlnd_ps.c')
-rw-r--r--ext/mysqlnd/mysqlnd_ps.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/mysqlnd/mysqlnd_ps.c b/ext/mysqlnd/mysqlnd_ps.c
index 767ba34ab0..4ffea76674 100644
--- a/ext/mysqlnd/mysqlnd_ps.c
+++ b/ext/mysqlnd/mysqlnd_ps.c
@@ -1115,6 +1115,8 @@ mysqlnd_fetch_stmt_row_cursor(MYSQLND_RES * result, void * param, unsigned int f
ZVAL_COPY_VALUE(result, data);
/* copied data, thus also the ownership. Thus null data */
ZVAL_NULL(data);
+ } else {
+ ZVAL_NULL(result);
}
}
}