PHP-143 - Memory leak in FutureSession

mpenick · mpenick · commit 109c52881e07 · 2017-02-06T17:01:51.000-05:00
diff --git a/ext/src/FutureSession.c b/ext/src/FutureSession.c
@@ -133,6 +133,8 @@ php_driver_future_session_free(php5to7_zend_object_free *object TSRMLS_DC)
     efree(self->exception_message);
   }
 
+  PHP5TO7_ZVAL_MAYBE_DESTROY(self->default_session);
+
   zend_object_std_dtor(&self->zval TSRMLS_CC);
   PHP5TO7_MAYBE_EFREE(self);
 }
@@ -149,6 +151,8 @@ php_driver_future_session_new(zend_class_entry *ce TSRMLS_DC)
   self->hash_key          = NULL;
   self->persist           = 0;
 
+  PHP5TO7_ZVAL_UNDEF(self->default_session);
+
   PHP5TO7_ZEND_OBJECT_INIT(future_session, self, ce);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -133,6 +133,8 @@ php_driver_future_session_free(php5to7_zend_object_free *object TSRMLS_DC)`
`133`	`133`	`efree(self->exception_message);`
`134`	`134`	`}`
`135`	`135`
	`136`	`+ PHP5TO7_ZVAL_MAYBE_DESTROY(self->default_session);`
	`137`	`+`
`136`	`138`	`zend_object_std_dtor(&self->zval TSRMLS_CC);`
`137`	`139`	`PHP5TO7_MAYBE_EFREE(self);`
`138`	`140`	`}`
`@@ -149,6 +151,8 @@ php_driver_future_session_new(zend_class_entry *ce TSRMLS_DC)`
`149`	`151`	`self->hash_key = NULL;`
`150`	`152`	`self->persist = 0;`
`151`	`153`
	`154`	`+ PHP5TO7_ZVAL_UNDEF(self->default_session);`
	`155`	`+`
`152`	`156`	`PHP5TO7_ZEND_OBJECT_INIT(future_session, self, ce);`
`153`	`157`	`}`
`154`	`158`