diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml index 65cdf72f3caf3..31331522d5452 100644 --- a/.github/workflows/push.yml +++ b/.github/workflows/push.yml @@ -15,6 +15,7 @@ on: - PHP-8.1 - PHP-8.2 - master + - Trigger-branch pull_request: branches: - '**' diff --git a/ext/phar/phar_object.c b/ext/phar/phar_object.c index ba47cd88439c5..8d29acf50b8ea 100644 --- a/ext/phar/phar_object.c +++ b/ext/phar/phar_object.c @@ -2116,7 +2116,8 @@ static zend_object *phar_rename_archive(phar_archive_data **sphar, char *ext) /* phar_destroy_phar_data(phar); *sphar = NULL; phar = pphar; - phar->refcount++; + /* FIX: GH-10755 Memory leak in phar_rename_archive() */ + /* phar->refcount++; */ newpath = oldpath; goto its_ok; } diff --git a/ext/phar/tests/bug69958.phpt b/ext/phar/tests/bug69958.phpt index b53c76a104951..577b96ce94acb 100644 --- a/ext/phar/tests/bug69958.phpt +++ b/ext/phar/tests/bug69958.phpt @@ -1,7 +1,5 @@ --TEST-- Phar: bug #69958: Segfault in Phar::convertToData on invalid file ---XFAIL-- -Still has memory leaks, see https://bugs.php.net/bug.php?id=70005 --EXTENSIONS-- phar --FILE--