summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXinchen Hui <laruence@php.net>2015-06-11 13:35:43 +0800
committerXinchen Hui <laruence@php.net>2015-06-11 13:35:43 +0800
commit141f0ca18cd0dd3846cd5e36e59a798e70fc6a6e (patch)
tree92accdc79a7c2ba3463a18a338629ab87129dff8
parent7f609231996885de5d4fd7a5e0410b62b4338d76 (diff)
downloadphp-git-141f0ca18cd0dd3846cd5e36e59a798e70fc6a6e.tar.gz
Fixed Bug #69796 mysqli_stmt::fetch doesn't assign null values to bound variables
-rw-r--r--NEWS4
-rw-r--r--ext/mysqlnd/mysqlnd_ps.c2
2 files changed, 6 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index 940950932d..ac4ba7cc54 100644
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,10 @@ PHP NEWS
. Fixed bug #69781 (phpinfo() reports Professional Editions of Windows
7/8/8.1/10 as "Business"). (Christian Wenz)
+- mysqlnd:
+ . Fixed Bug #69796 (mysqli_stmt::fetch doesn't assign null values to
+ bound variables). (Laruence);
+
- PDO_pgsql:
. Fixed bug #69752 (PDOStatement::execute() leaks memory with DML
Statements when closeCuror() is u). (Philip Hofstetter)
diff --git a/ext/mysqlnd/mysqlnd_ps.c b/ext/mysqlnd/mysqlnd_ps.c
index 70ea4e4874..767ba34ab0 100644
--- a/ext/mysqlnd/mysqlnd_ps.c
+++ b/ext/mysqlnd/mysqlnd_ps.c
@@ -925,6 +925,8 @@ mysqlnd_stmt_fetch_row_unbuffered(MYSQLND_RES * result, void * param, unsigned i
ZVAL_COPY_VALUE(result, data);
/* copied data, thus also the ownership. Thus null data */
ZVAL_NULL(data);
+ } else {
+ ZVAL_NULL(result);
}
}
}