summaryrefslogtreecommitdiff
path: root/ext/mysqlnd/mysqlnd_result_meta.c
diff options
context:
space:
mode:
authorAndrey Hristov <andrey@php.net>2010-05-25 23:18:13 +0000
committerAndrey Hristov <andrey@php.net>2010-05-25 23:18:13 +0000
commit433cb868d65545f021a63d994febae21a1abe8aa (patch)
treeacac0ce2dd034c27b0b88d7bd149c38d35ce937d /ext/mysqlnd/mysqlnd_result_meta.c
parentf4f5a5075199e1e976301de1863ceda007b25b66 (diff)
downloadphp-git-433cb868d65545f021a63d994febae21a1abe8aa.tar.gz
Handle the situation when MYSQLND_PROTOCOL's methods return NULL.
mysqlnd should not crash but gracefully return with an error.
Diffstat (limited to 'ext/mysqlnd/mysqlnd_result_meta.c')
-rw-r--r--ext/mysqlnd/mysqlnd_result_meta.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/ext/mysqlnd/mysqlnd_result_meta.c b/ext/mysqlnd/mysqlnd_result_meta.c
index 5c30aafead..9f4220bb25 100644
--- a/ext/mysqlnd/mysqlnd_result_meta.c
+++ b/ext/mysqlnd/mysqlnd_result_meta.c
@@ -151,6 +151,7 @@ MYSQLND_METHOD(mysqlnd_res_meta, read_metadata)(MYSQLND_RES_METADATA * const met
field_packet = conn->protocol->m.get_result_field_packet(conn->protocol, FALSE TSRMLS_CC);
if (!field_packet) {
+ SET_OOM_ERROR(conn->error_info);
DBG_RETURN(FAIL);
}
field_packet->persistent_alloc = meta->persistent;