ext/oci8: Fix GH-18873 - Free column->descid appropriately
#18957
Conversation
|
Thank you a lot for fixing this! ❤ |
|
I have cherrypicked this into unbundled oci8 ext - php/pecl-database-oci8#32 - and I can confirm this fixes the issue/test. |
ext/oci8/oci8.c
Outdated
| GC_DELREF(column->descid); | ||
| } | ||
| if (column->descid && !GC_DELREF(column->descid)) { | ||
| zend_list_close(column->descid); |
There was a problem hiding this comment.
It seems that the original code wanted to call zend_list_delete instead of zend_list_close.
Your fix is fine, but can be improved further by using zend_list_free instead of zend_list_close as we already know the refcount is 0.
There was a problem hiding this comment.
There are at least 5 other zend_list_close https://github.com/search?q=repo%3Aphp%2Fpecl-database-oci8%20zend_list_close&type=code calls.
|
Thanks! I’ll change it to |
ext/oci8/tests/gh18873.phpt
Outdated
| <?php | ||
| require_once 'skipifconnectfailure.inc'; | ||
|
|
||
| ob_start(); |
There was a problem hiding this comment.
There's an easier way, see
php-src/tests/output/gh15179.phpt
Line 9 in 4a98b36
SakiTakamachi
changed the title
zend_list_close()column->descid appropriately
SakiTakamachi
changed the title
column->descid appropriatelycolumn->descid appropriately
3 participants
fixes #18873
Since the resource will eventually be freed at the end of the script, this does not result in an actual memory leak, but this change fixes the issue of unnecessary memory usage growth.