diff options
| -rw-r--r-- | ext/mysqlnd/mysqlnd_wireprotocol.c | 4 | ||||
| -rwxr-xr-x | ext/pdo_mysql/php_pdo_mysql_int.h | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/ext/mysqlnd/mysqlnd_wireprotocol.c b/ext/mysqlnd/mysqlnd_wireprotocol.c index b9bf3b2de0..ab801cfccf 100644 --- a/ext/mysqlnd/mysqlnd_wireprotocol.c +++ b/ext/mysqlnd/mysqlnd_wireprotocol.c @@ -2319,8 +2319,10 @@ mysqlnd_net_init(zend_bool persistent TSRMLS_DC) void mysqlnd_net_free(MYSQLND_NET * net TSRMLS_DC) { - DBG_ENTER("mysqlnd_net_free"); zend_bool pers = net->persistent; + + DBG_ENTER("mysqlnd_net_free"); + if (net) { if (net->cmd_buffer.buffer) { DBG_INF("Freeing cmd buffer"); diff --git a/ext/pdo_mysql/php_pdo_mysql_int.h b/ext/pdo_mysql/php_pdo_mysql_int.h index 1f9f05ce54..0ee285f8f1 100755 --- a/ext/pdo_mysql/php_pdo_mysql_int.h +++ b/ext/pdo_mysql/php_pdo_mysql_int.h @@ -70,6 +70,12 @@ ZEND_BEGIN_MODULE_GLOBALS(pdo_mysql) char *debug; /* The actual string */ MYSQLND_DEBUG *dbg; /* The DBG object */ #endif +#if defined(PHP_WIN32) && !PDO_DBG_ENABLED + /* dummy member so we get at least one member in the struct + * and avoids build errors. + */ + void *dummymemmber; +#endif ZEND_END_MODULE_GLOBALS(pdo_mysql) ZEND_EXTERN_MODULE_GLOBALS(pdo_mysql); |