diff options
author | Andrey Hristov <andrey@php.net> | 2010-05-25 23:18:13 +0000 |
---|---|---|
committer | Andrey Hristov <andrey@php.net> | 2010-05-25 23:18:13 +0000 |
commit | 58f13c3c9f25b36cedcdf48c15dd8cabec7985b0 (patch) | |
tree | 24f32259122fcceb818ea9cc00e3a02d0bede5e8 /ext/mysqlnd/mysqlnd_result_meta.c | |
parent | bccf2cea5dc8084119382bd5f1ec0abfad223551 (diff) | |
download | php-git-58f13c3c9f25b36cedcdf48c15dd8cabec7985b0.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.c | 1 |
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; |