mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-02 22:34:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix crash if OOM and USE_ZEND_ALLOC=0

Browse Source
This commit is contained in:
Andrey Hristov 2010-04-29 11:49:08 +00:00
parent 48073dd7f6
commit 6c1a2831f6
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ext/mysqlnd/mysqlnd_wireprotocol.c
View File

@ -705,7 +705,7 @@ size_t php_mysqlnd_cmd_write(void *_packet, MYSQLND *conn TSRMLS_DC)
MYSQLND_PACKET_COMMAND *packet= (MYSQLND_PACKET_COMMAND *) _packet; MYSQLND_PACKET_COMMAND *packet= (MYSQLND_PACKET_COMMAND *) _packet;
MYSQLND_NET *net = conn->net; MYSQLND_NET *net = conn->net;
unsigned int error_reporting = EG(error_reporting); unsigned int error_reporting = EG(error_reporting);
size_t written; size_t written = 0;
DBG_ENTER("php_mysqlnd_cmd_write"); DBG_ENTER("php_mysqlnd_cmd_write");
/* /*
@ -734,6 +734,9 @@ size_t php_mysqlnd_cmd_write(void *_packet, MYSQLND *conn TSRMLS_DC)
size_t tmp_len = packet->arg_len + 1 + MYSQLND_HEADER_SIZE, ret; size_t tmp_len = packet->arg_len + 1 + MYSQLND_HEADER_SIZE, ret;
zend_uchar *tmp, *p; zend_uchar *tmp, *p;
tmp = (tmp_len > net->cmd_buffer.length)? mnd_emalloc(tmp_len):net->cmd_buffer.buffer; tmp = (tmp_len > net->cmd_buffer.length)? mnd_emalloc(tmp_len):net->cmd_buffer.buffer;
if (!tmp) {
goto end;
}
p = tmp + MYSQLND_HEADER_SIZE; /* skip the header */ p = tmp + MYSQLND_HEADER_SIZE; /* skip the header */
int1store(p, packet->command); int1store(p, packet->command);
@ -748,6 +751,7 @@ size_t php_mysqlnd_cmd_write(void *_packet, MYSQLND *conn TSRMLS_DC)
} }
written = ret; written = ret;
} }
end:
if (error_reporting) { if (error_reporting) {
/* restore error reporting */ /* restore error reporting */
EG(error_reporting) = error_reporting; EG(error_reporting) = error_reporting;