summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrey Hristov <andrey@php.net>2013-03-13 13:37:51 +0100
committerAndrey Hristov <andrey@php.net>2013-03-13 13:37:51 +0100
commitf1e2edff8befb7863723adbe5680ce3d9714d9ed (patch)
tree7acf48de9e21afd2655105f155a591a1b7dfbf99
parentbdaafe3c7b7f388e34078a0a9d7215c8d58acadb (diff)
downloadphp-git-f1e2edff8befb7863723adbe5680ce3d9714d9ed.tar.gz
fix for bug #63530 mysqlnd_stmt::bind_one_parameter uses wrong alloc for stmt->param_bind
-rw-r--r--NEWS4
-rw-r--r--ext/mysqlnd/mysqlnd_ps.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index 82afa3a040..fb877c0185 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,10 @@ PHP NEWS
- PCRE:
. Merged PCRE 8.32). (Anatol)
+- mysqlnd
+ . Fixed bug #63530 (mysqlnd_stmt::bind_one_parameter crashes, uses wrong alloc
+ for stmt->param_bind). (Andrey)
+
28 Feb 2013, PHP 5.3.23RC1
diff --git a/ext/mysqlnd/mysqlnd_ps.c b/ext/mysqlnd/mysqlnd_ps.c
index c553aa55a7..00205907a9 100644
--- a/ext/mysqlnd/mysqlnd_ps.c
+++ b/ext/mysqlnd/mysqlnd_ps.c
@@ -1485,7 +1485,7 @@ MYSQLND_METHOD(mysqlnd_stmt, bind_one_parameter)(MYSQLND_STMT * const s, unsigne
if (stmt->param_count) {
if (!stmt->param_bind) {
- stmt->param_bind = mnd_ecalloc(stmt->param_count, sizeof(MYSQLND_PARAM_BIND));
+ stmt->param_bind = mnd_pecalloc(stmt->param_count, sizeof(MYSQLND_PARAM_BIND), stmt->persistent);
if (!stmt->param_bind) {
DBG_RETURN(FAIL);
}