diff options
| author | Xinchen Hui <laruence@gmail.com> | 2017-04-07 15:20:53 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@gmail.com> | 2017-04-07 15:20:53 +0800 |
| commit | 39327b90e3eef1128c757e0970c4c9935c83f889 (patch) | |
| tree | 12ef39ada3d08c229128fe45c4ac4ae46e453f16 /ext/mysqlnd/mysqlnd_ps.c | |
| parent | adc49b1d18788cb8497eb176d4ac147f144f79bf (diff) | |
| parent | 27120d4412a7122f27ac1fcd4d91090ce7979647 (diff) | |
| download | php-git-39327b90e3eef1128c757e0970c4c9935c83f889.tar.gz | |
Merge branch 'PHP-7.0' into PHP-7.1
* PHP-7.0:
Fix invalid free of persistent results on error/connection loss in mysqlnd (bug 74376)
Conflicts:
ext/mysqlnd/mysqlnd_ps.c
Diffstat (limited to 'ext/mysqlnd/mysqlnd_ps.c')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_ps.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ext/mysqlnd/mysqlnd_ps.c b/ext/mysqlnd/mysqlnd_ps.c index 256bbe4d47..41c024ab16 100644 --- a/ext/mysqlnd/mysqlnd_ps.c +++ b/ext/mysqlnd/mysqlnd_ps.c @@ -122,7 +122,7 @@ MYSQLND_METHOD(mysqlnd_stmt, store_result)(MYSQLND_STMT * const s) } else { COPY_CLIENT_ERROR(conn->error_info, result->stored_data->error_info); stmt->result->m.free_result_contents(stmt->result); - mnd_efree(stmt->result); + mnd_pefree(stmt->result, stmt->result->persistent); stmt->result = NULL; stmt->state = MYSQLND_STMT_PREPARED; } @@ -347,7 +347,7 @@ mysqlnd_stmt_prepare_read_eof(MYSQLND_STMT * s) if (FAIL == (ret = PACKET_READ(fields_eof))) { if (stmt->result) { stmt->result->m.free_result_contents(stmt->result); - mnd_efree(stmt->result); + mnd_pefree(stmt->result, stmt->result->persistent); /* XXX: This will crash, because we will null also the methods. But seems it happens in extreme cases or doesn't. Should be fixed by exporting a function (from mysqlnd_driver.c?) to do the reset. |