php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-23 07:58:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix a problem that leads to leaks in plugins that

Browse Source 
use stmt local data - no free is called for statements
that are over-prepared
This commit is contained in:
Andrey Hristov
2010-09-29 13:18:07 +00:00
parent 9d6fa31713
commit d55566c7b8
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ext/mysqlnd/mysqlnd_ps.c
+13 -7
View File
@@ -433,13 +433,19 @@ MYSQLND_METHOD(mysqlnd_stmt, prepare)(MYSQLND_STMT * const s, const char * const
}
if (stmt_to_prepare != stmt) {
/* Free old buffers, binding and resources on server */
s->m->net_close(s, TRUE TSRMLS_CC);
memcpy(stmt, stmt_to_prepare, sizeof(MYSQLND_STMT_DATA));
/* Now we will have a clean new statement object */
mnd_pefree(stmt_to_prepare, stmt_to_prepare->persistent);
/* swap */
size_t real_size = sizeof(MYSQLND_STMT) + mysqlnd_plugin_count() * sizeof(void *);
char * tmp_swap = mnd_malloc(real_size);
memcpy(tmp_swap, s, real_size);
memcpy(s, s_to_prepare, real_size);
memcpy(s_to_prepare, tmp_swap, real_size);
mnd_free(tmp_swap);
{
MYSQLND_STMT_DATA * tmp_swap_data = stmt_to_prepare;
stmt_to_prepare = stmt;
stmt = tmp_swap_data;
}
s_to_prepare->m->dtor(s_to_prepare, TRUE TSRMLS_CC);
}
stmt->state = MYSQLND_STMT_PREPARED;
DBG_INF("PASS");