Skip to content

Bugfix 72791: fix memory leak in PDO persistent connections #2067

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 9, 2016
Merged

Bugfix 72791: fix memory leak in PDO persistent connections #2067

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
98e4d50
Bugfix 72791: fix memory leak in PDO persistent connections
keyurdg Aug 9, 2016
2ab9a2d
Fix ASSERT logic
keyurdg Aug 9, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions ext/pdo/pdo_dbh.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,7 +297,7 @@ static PHP_METHOD(PDO, dbh_constructor)
/* is the connection still alive ? */
if (pdbh->methods->check_liveness && FAILURE == (pdbh->methods->check_liveness)(pdbh)) {
/* nope... need to kill it */
/*??? memory leak */
pdbh->refcount--;
zend_list_close(le);
pdbh = NULL;
}
Expand All @@ -310,6 +310,7 @@ static PHP_METHOD(PDO, dbh_constructor)
/* need a brand new pdbh */
pdbh = pecalloc(1, sizeof(*pdbh), 1);

pdbh->refcount = 1;
pdbh->is_persistent = 1;
pdbh->persistent_id = pemalloc(plen + 1, 1);
memcpy((char *)pdbh->persistent_id, hashkey, plen+1);
Expand All @@ -322,6 +323,7 @@ static PHP_METHOD(PDO, dbh_constructor)
efree(dbh);
/* switch over to the persistent one */
Z_PDO_OBJECT_P(object)->inner = pdbh;
pdbh->refcount++;
dbh = pdbh;
}

Expand Down Expand Up @@ -1508,8 +1510,13 @@ static void dbh_free(pdo_dbh_t *dbh, zend_bool free_persistent)
dbh->query_stmt = NULL;
}

if (dbh->is_persistent && !free_persistent) {
return;
if (dbh->is_persistent) {
#if ZEND_DEBUG
ZEND_ASSERT(!free_persistent || (dbh->refcount == 1));
#endif
if (!free_persistent && (--dbh->refcount)) {
return;
}
}

if (dbh->methods) {
Expand Down