From c389adb96aaeebb28dfecba0ba9316eedf0d33b5 Mon Sep 17 00:00:00 2001 From: Andrey Hristov Date: Tue, 25 May 2010 22:36:33 +0000 Subject: [PATCH] Use only memory that has been allocated --- ext/mysqlnd/mysqlnd_net.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/ext/mysqlnd/mysqlnd_net.c b/ext/mysqlnd/mysqlnd_net.c index 5a3fda5e98..f169506691 100644 --- a/ext/mysqlnd/mysqlnd_net.c +++ b/ext/mysqlnd/mysqlnd_net.c @@ -885,13 +885,14 @@ mysqlnd_net_init(zend_bool persistent TSRMLS_DC) DBG_ENTER("mysqlnd_net_init"); DBG_INF_FMT("persistent=%d", persistent); - net->persistent = persistent; - - net->m = mysqlnd_mysqlnd_net_methods; + if (net) { + net->persistent = persistent; + net->m = mysqlnd_mysqlnd_net_methods; - { - unsigned int buf_size = MYSQLND_G(net_cmd_buffer_size); /* this is long, cast to unsigned int*/ - net->m.set_client_option(net, MYSQLND_OPT_NET_CMD_BUFFER_SIZE, (char *) &buf_size TSRMLS_CC); + { + unsigned int buf_size = MYSQLND_G(net_cmd_buffer_size); /* this is long, cast to unsigned int*/ + net->m.set_client_option(net, MYSQLND_OPT_NET_CMD_BUFFER_SIZE, (char *) &buf_size TSRMLS_CC); + } } DBG_RETURN(net); } -- 2.40.0