]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.4' into PHP-8.0
authorChristoph M. Becker <cmbecker69@gmx.de>
Tue, 5 Jan 2021 13:24:59 +0000 (14:24 +0100)
committerChristoph M. Becker <cmbecker69@gmx.de>
Tue, 5 Jan 2021 13:25:44 +0000 (14:25 +0100)
* PHP-7.4:
  Fix memory leak in Phar::webPhar() on Windows

1  2 
ext/phar/phar_object.c

index 0cb94de993519d2a68f1887ebc786be5c483bd39,db70f4cc71e7d5e4c9a6f02d2a6df132494a5b3f..a4965d93351a7811fbd0b4a76be67d175af270ee
@@@ -707,18 -731,15 +707,20 @@@ PHP_METHOD(Phar, webPhar
                                efree(pt);
  
                                zend_bailout();
-                               return;
 -                              goto finish;
                        default:
 +                              zend_throw_exception_ex(phar_ce_PharException, 0, "phar error: rewrite callback must return a string or false");
 +
 +cleanup_fail:
 +                              zval_ptr_dtor(&params);
                                if (free_pathinfo) {
                                        efree(path_info);
                                }
 +                              efree(entry);
                                efree(pt);
 -
 -                              zend_throw_exception_ex(phar_ce_PharException, 0, "phar error: rewrite callback must return a string or false");
 -                              goto finish;
++#ifdef PHP_WIN32
++                              efree(fname);
++#endif
 +                              RETURN_THROWS();
                }
        }