svn: /php/php-src/ branches/PHP_5_3/ext/mysqlnd/mysqlnd_net.c branches/PHP_5_3/ext/mysqlnd/mysqlnd_ps.c
branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.c trunk/ext/mysqlnd/mysqlnd_net.c trunk/ext/mysqlnd/mysqlnd_ps.c
trunk/ext/mysqlnd/mysqlnd_wireprotocol.c
| From: | Andrey Hristov | Date: | Fri, 14 May 2010 13:04:33 +0000 |
| Subject: | svn: /php/php-src/ branches/PHP_5_3/ext/mysqlnd/mysqlnd_net.c branches/PHP_5_3/ext/mysqlnd/mysqlnd_ps.c branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.c trunk/ext/mysqlnd/mysqlnd_net.c trunk/ext/mysqlnd/mysqlnd_ps.c trunk/ext/mysqlnd/mysqlnd_wireprotocol.c |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-62627@lists.php.net to get a copy of this message | ||
andrey Fri, 14 May 2010 13:04:33 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=299377
Log:
OOM fixes
Changed paths:
U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_net.c
U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_ps.c
U php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.c
U php/php-src/trunk/ext/mysqlnd/mysqlnd_net.c
U php/php-src/trunk/ext/mysqlnd/mysqlnd_ps.c
U php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.c
Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_net.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_net.c 2010-05-14 12:24:54 UTC (rev 299376)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_net.c 2010-05-14 13:04:33 UTC (rev 299377)
@@ -942,7 +942,7 @@
/* }}} */
-/* {{{ mysqlnd_res_meta_get_methods */
+/* {{{ mysqlnd_net_get_methods */
PHPAPI struct st_mysqlnd_net_methods *
mysqlnd_net_get_methods()
{
Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_ps.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_ps.c 2010-05-14 12:24:54 UTC (rev 299376)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_ps.c 2010-05-14 13:04:33 UTC (rev 299377)
@@ -237,21 +237,24 @@
MYSQLND_STMT_DATA * stmt = s->data;
/* Follows parameter metadata, we have just to skip it, as libmysql does */
unsigned int i = 0;
- enum_func_status ret = PASS;
+ enum_func_status ret = FAIL;
MYSQLND_PACKET_RES_FIELD * field_packet;
DBG_ENTER("mysqlnd_stmt_skip_metadata");
DBG_INF_FMT("stmt=%lu", stmt->stmt_id);
field_packet =
stmt->conn->protocol->m.get_result_field_packet(stmt->conn->protocol, FALSE
TSRMLS_CC);
- field_packet->skip_parsing = TRUE;
- for (;i < stmt->param_count; i++) {
- if (FAIL == PACKET_READ(field_packet, stmt->conn)) {
- ret = FAIL;
- break;
+ if (field_packet) {
+ ret = PASS;
+ field_packet->skip_parsing = TRUE;
+ for (;i < stmt->param_count; i++) {
+ if (FAIL == PACKET_READ(field_packet, stmt->conn)) {
+ ret = FAIL;
+ break;
+ }
}
+ PACKET_FREE(field_packet);
}
- PACKET_FREE(field_packet);
DBG_RETURN(ret);
}
Modified: php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.c 2010-05-14 12:24:54 UTC (rev
299376)
+++ php/php-src/branches/PHP_5_3/ext/mysqlnd/mysqlnd_wireprotocol.c 2010-05-14 13:04:33 UTC (rev
299377)
@@ -1024,6 +1024,10 @@
BAIL_IF_NO_MORE_DATA;
DBG_INF_FMT("Def found, length %lu, persistent=%d", len, packet->persistent_alloc);
meta->def = mnd_pemalloc(len + 1, packet->persistent_alloc);
+ if (!meta->def) {
+ SET_OOM_ERROR(conn->error_info);
+ DBG_RETURN(FAIL);
+ }
memcpy(meta->def, p, len);
meta->def[len] = '\0';
meta->def_length = len;
@@ -1032,6 +1036,11 @@
DBG_INF_FMT("allocing root. persistent=%d", packet->persistent_alloc);
root_ptr = meta->root = mnd_pemalloc(total_len, packet->persistent_alloc);
+ if (!root_ptr) {
+ SET_OOM_ERROR(conn->error_info);
+ DBG_RETURN(FAIL);
+ }
+
meta->root_len = total_len;
/* Now do allocs */
if (meta->catalog && meta->catalog != mysqlnd_empty_string) {
@@ -1100,7 +1109,6 @@
void php_mysqlnd_rset_field_free_mem(void *_packet, zend_bool alloca TSRMLS_DC)
{
MYSQLND_PACKET_RES_FIELD *p= (MYSQLND_PACKET_RES_FIELD *) _packet;
-
/* p->metadata was passed to us as temporal buffer */
if (!alloca) {
mnd_pefree(p, p->header.persistent);
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_net.c
===================================================================
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_net.c 2010-05-14 12:24:54 UTC (rev 299376)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_net.c 2010-05-14 13:04:33 UTC (rev 299377)
@@ -942,7 +942,7 @@
/* }}} */
-/* {{{ mysqlnd_res_meta_get_methods */
+/* {{{ mysqlnd_net_get_methods */
PHPAPI struct st_mysqlnd_net_methods *
mysqlnd_net_get_methods()
{
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_ps.c
===================================================================
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_ps.c 2010-05-14 12:24:54 UTC (rev 299376)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_ps.c 2010-05-14 13:04:33 UTC (rev 299377)
@@ -237,21 +237,24 @@
MYSQLND_STMT_DATA * stmt = s->data;
/* Follows parameter metadata, we have just to skip it, as libmysql does */
unsigned int i = 0;
- enum_func_status ret = PASS;
+ enum_func_status ret = FAIL;
MYSQLND_PACKET_RES_FIELD * field_packet;
DBG_ENTER("mysqlnd_stmt_skip_metadata");
DBG_INF_FMT("stmt=%lu", stmt->stmt_id);
field_packet =
stmt->conn->protocol->m.get_result_field_packet(stmt->conn->protocol, FALSE
TSRMLS_CC);
- field_packet->skip_parsing = TRUE;
- for (;i < stmt->param_count; i++) {
- if (FAIL == PACKET_READ(field_packet, stmt->conn)) {
- ret = FAIL;
- break;
+ if (field_packet) {
+ ret = PASS;
+ field_packet->skip_parsing = TRUE;
+ for (;i < stmt->param_count; i++) {
+ if (FAIL == PACKET_READ(field_packet, stmt->conn)) {
+ ret = FAIL;
+ break;
+ }
}
+ PACKET_FREE(field_packet);
}
- PACKET_FREE(field_packet);
DBG_RETURN(ret);
}
Modified: php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.c
===================================================================
--- php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.c 2010-05-14 12:24:54 UTC (rev 299376)
+++ php/php-src/trunk/ext/mysqlnd/mysqlnd_wireprotocol.c 2010-05-14 13:04:33 UTC (rev 299377)
@@ -1024,6 +1024,10 @@
BAIL_IF_NO_MORE_DATA;
DBG_INF_FMT("Def found, length %lu, persistent=%d", len, packet->persistent_alloc);
meta->def = mnd_pemalloc(len + 1, packet->persistent_alloc);
+ if (!meta->def) {
+ SET_OOM_ERROR(conn->error_info);
+ DBG_RETURN(FAIL);
+ }
memcpy(meta->def, p, len);
meta->def[len] = '\0';
meta->def_length = len;
@@ -1032,6 +1036,11 @@
DBG_INF_FMT("allocing root. persistent=%d", packet->persistent_alloc);
root_ptr = meta->root = mnd_pemalloc(total_len, packet->persistent_alloc);
+ if (!root_ptr) {
+ SET_OOM_ERROR(conn->error_info);
+ DBG_RETURN(FAIL);
+ }
+
meta->root_len = total_len;
/* Now do allocs */
if (meta->catalog && meta->catalog != mysqlnd_empty_string) {
@@ -1100,7 +1109,6 @@
void php_mysqlnd_rset_field_free_mem(void *_packet, zend_bool alloca TSRMLS_DC)
{
MYSQLND_PACKET_RES_FIELD *p= (MYSQLND_PACKET_RES_FIELD *) _packet;
-
/* p->metadata was passed to us as temporal buffer */
if (!alloca) {
mnd_pefree(p, p->header.persistent);