com php-src: Fixed bug #77773: NEWS ext/mysqlnd/mysqlnd_resul t.c
| From: | Nikita Popov | Date: | Fri, 22 Mar 2019 12:07:00 +0000 |
| Subject: | com php-src: Fixed bug #77773: NEWS ext/mysqlnd/mysqlnd_resul t.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-105304@lists.php.net to get a copy of this message | ||
Commit: 30ddfd49edbd8066cc0a18a557e3de30c2397d12
Author: Nikita Popov <nikita.ppv@gmail.com> Fri, 22 Mar 2019 13:07:00 +0100
Parents: 620a753185e575c8d48779764f376f6227b6e293
Branches: PHP-7.3 PHP-7.4 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=30ddfd49edbd8066cc0a18a557e3de30c2397d12
Log:
Fixed bug #77773
Bugs:
https://bugs.php.net/77773
Changed paths:
M NEWS
M ext/mysqlnd/mysqlnd_result.c
Diff:
diff --git a/NEWS b/NEWS
index 499a435..30a0b19 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,10 @@ PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? ????, PHP 7.3.5
+- MySQLi:
+ . Fixed bug #77773 (Unbuffered queries leak memory - MySQLi / mysqlnd).
+ (Nikita)
+
- Reflection:
. Fixed bug #77772 (ReflectionClass::getMethods(null) doesn't work). (Nikita)
diff --git a/ext/mysqlnd/mysqlnd_result.c b/ext/mysqlnd/mysqlnd_result.c
index 5e3b86e..f0852af 100644
--- a/ext/mysqlnd/mysqlnd_result.c
+++ b/ext/mysqlnd/mysqlnd_result.c
@@ -781,6 +781,7 @@ MYSQLND_METHOD(mysqlnd_result_unbuffered, fetch_row)(MYSQLND_RES * result, void
MYSQLND_PACKET_ROW *row_packet = result->unbuf->row_packet;
const MYSQLND_RES_METADATA * const meta = result->meta;
MYSQLND_CONN_DATA * const conn = result->conn;
+ void *checkpoint;
DBG_ENTER("mysqlnd_result_unbuffered::fetch_row");
@@ -800,6 +801,9 @@ MYSQLND_METHOD(mysqlnd_result_unbuffered, fetch_row)(MYSQLND_RES * result, void
/* Let the row packet fill our buffer and skip additional mnd_malloc + memcpy */
row_packet->skip_extraction = row? FALSE:TRUE;
+ checkpoint = result->memory_pool->checkpoint;
+ mysqlnd_mempool_save_state(result->memory_pool);
+
/*
If we skip rows (row == NULL) we have to
result->m.unbuffered_free_last_data() before it. The function returns always true.
@@ -824,6 +828,8 @@ MYSQLND_METHOD(mysqlnd_result_unbuffered, fetch_row)(MYSQLND_RES * result, void
conn->options->int_and_float_native,
conn->stats);
if (PASS != rc) {
+ mysqlnd_mempool_restore_state(result->memory_pool);
+ result->memory_pool->checkpoint = checkpoint;
DBG_RETURN(FAIL);
}
{
@@ -894,6 +900,9 @@ MYSQLND_METHOD(mysqlnd_result_unbuffered, fetch_row)(MYSQLND_RES * result, void
result->unbuf->m.free_last_data(result->unbuf, conn->stats);
}
+ mysqlnd_mempool_restore_state(result->memory_pool);
+ result->memory_pool->checkpoint = checkpoint;
+
DBG_INF_FMT("ret=%s fetched=%u", ret == PASS? "PASS":"FAIL",
*fetched_anything);
DBG_RETURN(PASS);
}