Fix a memory leak when regenerating IDs (#1445)

michael-grunder · web-flow · commit 92f14b1480b7 · 2018-11-06T21:20:06.000-08:00
Make sure we free any existing session lock key if we're going to
update it.  Otherwise we will leak that memory.
diff --git a/redis_session.c b/redis_session.c
@@ -616,6 +616,7 @@ PS_CREATE_SID_FUNC(redis)
 #endif
         }
 
+        if (pool->lock_status.session_key) zend_string_release(pool->lock_status.session_key);
 #if (PHP_MAJOR_VERSION < 7)
         pool->lock_status.session_key = redis_session_key(rpm, sid, strlen(sid));
 #else
@@ -758,6 +759,7 @@ PS_READ_FUNC(redis)
     }
 
     /* send GET command */
+    if (pool->lock_status.session_key) zend_string_release(pool->lock_status.session_key);
     pool->lock_status.session_key = redis_session_key(rpm, skey, skeylen);
     cmd_len = REDIS_SPPRINTF(&cmd, "GET", "S", pool->lock_status.session_key);
 

Original file line number	Diff line number	Diff line change
`@@ -616,6 +616,7 @@ PS_CREATE_SID_FUNC(redis)`
`616`	`616`	`#endif`
`617`	`617`	`}`
`618`	`618`
	`619`	`+ if (pool->lock_status.session_key) zend_string_release(pool->lock_status.session_key);`
`619`	`620`	`#if (PHP_MAJOR_VERSION < 7)`
`620`	`621`	`pool->lock_status.session_key = redis_session_key(rpm, sid, strlen(sid));`
`621`	`622`	`#else`
`@@ -758,6 +759,7 @@ PS_READ_FUNC(redis)`
`758`	`759`	`}`
`759`	`760`
`760`	`761`	`/* send GET command */`
	`762`	`+ if (pool->lock_status.session_key) zend_string_release(pool->lock_status.session_key);`
`761`	`763`	`pool->lock_status.session_key = redis_session_key(rpm, skey, skeylen);`
`762`	`764`	`cmd_len = REDIS_SPPRINTF(&cmd, "GET", "S", pool->lock_status.session_key);`
`763`	`765`