Skip to content

[pull] master from php:master#784

Merged
pull[bot] merged 6 commits intoturkdevops:masterfrom
php:master
Mar 14, 2026
Merged

[pull] master from php:master#784
pull[bot] merged 6 commits intoturkdevops:masterfrom
php:master

Conversation

@pull
Copy link

@pull pull bot commented Mar 14, 2026

See Commits and Changes for more details.


Created by pull[bot] (v2.0.0-alpha.4)

Can you help keep this open source service alive? 💖 Please sponsor : )

arshidkv12 and others added 6 commits March 14, 2026 10:50
Fixes to GH-14078:

* Rename ZipArchive::openBuffer() to ::openString().
* For consistency with ::open(), return int|bool, don't throw an
  exception on error. Provide error information via existing properties
  and accessors.
* Fix memory leak when ::openString() is called but ::close() is not
  called. Add test.
* Fix memory leak when a call to ::open() is followed by a call to
  ::openString(). Add test.
* Let libzip own the source, don't call zip_source_keep().
* Share buffer handling with ZipArchive::addFromString().

Elsewhere:

* If there is an error from zip_close() during a call to
  ZipArchive::open(), emit a warning but proceed to open the archive,
  don't return early. Add test.
* When buffers are saved by ZipArchive::addFromString(), release them
  in ZipArchive::close() and ::open(), don't accumulate buffers until
  the free_obj handler is called.
* Factor out buffer handling and reuse it in ZipArchive::openString()

Closes GH-21205.
Closes GH-14078.

Co-authored-by: Soner Sayakci <s.sayakci@shopware.com>
Co-authored-by: Ghaith Olabi <24876890+Gaitholabi@users.noreply.github.com>
* PHP-8.4:
  ext/zip: Fix const-generic compile warning
* PHP-8.5:
  ext/zip: Fix const-generic compile warning
@pull pull bot locked and limited conversation to collaborators Mar 14, 2026
@pull pull bot added the ⤵️ pull label Mar 14, 2026
@pull pull bot merged commit c197fad into turkdevops:master Mar 14, 2026
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants