From 433cb868d65545f021a63d994febae21a1abe8aa Mon Sep 17 00:00:00 2001 From: Andrey Hristov Date: Tue, 25 May 2010 23:18:13 +0000 Subject: Handle the situation when MYSQLND_PROTOCOL's methods return NULL. mysqlnd should not crash but gracefully return with an error. --- ext/mysqlnd/mysqlnd_result_meta.c | 1 + 1 file changed, 1 insertion(+) (limited to 'ext/mysqlnd/mysqlnd_result_meta.c') 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; -- cgit v1.2.1