PHP-142 - Memory Leak in Timestamp::toDateTime()

mpenick · mpenick · commit 562d25171861 · 2017-08-04T14:49:38.000-04:00
* Also UserTypeValue::values()
diff --git a/ext/src/Timestamp.c b/ext/src/Timestamp.c
@@ -139,7 +139,7 @@ PHP_METHOD(Timestamp, toDateTime)
   php_date_initialize(datetime_obj, str, str_len, NULL, NULL, 0 TSRMLS_CC);
   efree(str);
 
-  RETVAL_ZVAL(datetime, 0, 0);
+  RETVAL_ZVAL(datetime, 0, 1);
 }
 /* }}} */
 
diff --git a/ext/src/UserTypeValue.c b/ext/src/UserTypeValue.c
@@ -144,7 +144,6 @@ PHP_METHOD(UserTypeValue, type)
 PHP_METHOD(UserTypeValue, values)
 {
   php_driver_user_type_value *self = NULL;
-  array_init(return_value);
   self = PHP_DRIVER_GET_USER_TYPE_VALUE(getThis());
 
   array_init(return_value);

Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ PHP_METHOD(Timestamp, toDateTime)`
`139`	`139`	`php_date_initialize(datetime_obj, str, str_len, NULL, NULL, 0 TSRMLS_CC);`
`140`	`140`	`efree(str);`
`141`	`141`
`142`		`- RETVAL_ZVAL(datetime, 0, 0);`
	`142`	`+ RETVAL_ZVAL(datetime, 0, 1);`
`143`	`143`	`}`
`144`	`144`	`/* }}} */`
`145`	`145`
Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,6 @@ PHP_METHOD(UserTypeValue, type)`
`144`	`144`	`PHP_METHOD(UserTypeValue, values)`
`145`	`145`	`{`
`146`	`146`	`php_driver_user_type_value *self = NULL;`
`147`		`- array_init(return_value);`
`148`	`147`	`self = PHP_DRIVER_GET_USER_TYPE_VALUE(getThis());`
`149`	`148`
`150`	`149`	`array_init(return_value);`