From: Keyur <kgovande@etsy.com>
Date: Tue, 9 Aug 2016 14:01:25 +0000 (+0000)
Subject: Bugfix 72791: fix memory leak in PDO persistent connections
X-Git-Tag: php-7.2.0alpha1~1558^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1aca1771ff1bd8374dcc8b91f19417b145130ddf;p=php

Bugfix 72791: fix memory leak in PDO persistent connections
---

diff --git a/ext/pdo/pdo_dbh.c b/ext/pdo/pdo_dbh.c
index 20a72a1f59..461c65471b 100644
--- a/ext/pdo/pdo_dbh.c
+++ b/ext/pdo/pdo_dbh.c
@@ -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;
 					}
@@ -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);
@@ -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;
 		}
 
@@ -1504,8 +1506,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) {