Skip to content

[curl] Free pushed handle when CURLMOPT_PUSHFUNCTION denies or throws - #297

Open
iliaal wants to merge 9 commits into
PHP-8.4from
fix/curl-push-deny-leak-84
Open

iliaal wants to merge 9 commits into
PHP-8.4from
fix/curl-push-deny-leak-84

Conversation

@iliaal

@iliaal iliaal commented Aug 24, 2026

Copy link
Copy Markdown
Owner

On CURL_PUSH_DENY or a throw in the CURLMOPT_PUSHFUNCTION callback, libcurl destroys the pushed handle itself, but ext/curl leaves ch->cp stale and never releases the new CurlHandle zval, leaking a wrapper per denied push. _php_setup_easy_copy_handlers() had cloned it from the parent, so the shared clone counter stays permanently bumped and ch->cp dangles. Teardown moves from curl_free_obj() into _php_curl_free_instance(), reused when the callback denies or throws to clear ch->cp, undo the increment, release state and drop the zval. The phpt drives 200 denied pushes, skipping when none arrive.

devnexen and others added 9 commits September 18, 2026 21:01
…ansformation.

Fix php#23730

Importing a stylesheet from a php:function callback freed the stylesheet
libxslt was still applying, and the transformation methods kept using the
stale pointer to save the result. The transformation depth is now tracked
on the object and importStylesheet() throws while it is non-zero.

Close phpGH-23737
… callback.

Fix php#23747

ZipArchive::close() called from a progress or cancel callback ran a
nested zip_close() that failed, then zip_discard() freed the archive
while the outer zip_close() from close() or open() was still using it.
Track the close in progress and throw an Error from close() and open()
meanwhile.

Close phpGH-23749
…luation

Reconstructing the object from a php:function callback freed the context
libxml2 was still evaluating, and php_xpath_eval() wrote back into it once
the evaluation returned. The evaluation depth is now tracked on the object
and __construct() throws while it is non-zero.

Close phpGH-23735
The prompt parser ran as a do-while, so an empty cli.prompt executed
the body on the terminator and scanned past it. Use a while loop and
smart_str_extract(), which returns the interned empty string when
nothing was appended. No regression test: extra unicode warnings from
the over-read depend on heap contents, so a .phpt cannot pin the bug
red-before.

Closes phpGH-23415
init_process_info() memset the pointer parameter instead of the
PROCESS_INFORMATION structure it points at, leaving the struct
uninitialized before CreateProcessW(). Zero it through the pointer.

find_comspec_nt() dereferences *comspec in its cleanup while the
caller only assigns it on success, so a failed SearchPathW() read an
indeterminate value. Initialize the caller's variable to NULL.

set_proc_descriptor_to_blackhole() tested CreateFileA() against NULL,
but CreateFileA() signals failure with INVALID_HANDLE_VALUE, so a
failed open went undetected and an invalid handle was inherited by
the child. Test against INVALID_HANDLE_VALUE.

Closes phpGH-23412
…tructions with callable conversion

Call level counter was broken: ZEND_CALLABLE_CONVERT was forgotten.

Closes phpGH-23777.
The x86 matcher folds v = BINOP(a, b); c = CMP(v, 0); GUARD(c) into
IR_GUARD_JCC_INT, emitting the BINOP, dropping the CMP and branching on
the flags the BINOP left, but it only required the BINOP to precede the
CMP in the IR. Once GCM hoists a loop-invariant BINOP into a dominating
block, the jcc reads flags the intervening code has clobbered and the
guard fires on whatever is in EFLAGS. Require the BINOP to sit in the
guard's block and allow only snapshots between the comparison and the
guard, the way ir_match_fuse_load() pairs ir_in_same_block() with
ir_match_has_mem_deps(). The sibling MEM_BINOP fold already checks the
block, the IF side folds are pinned by full ref adjacency, and
ir_aarch64.dasc has no guard fold.

Mirrors the upstream fix dstogov/ir@51107a3.

Fixes phpGH-23693
Closes phpGH-23711
When the push callback denies the push, or throws and leaves the return
value undefined, libcurl destroys the easy handle itself, but the wrapper
kept a stale ch->cp and never released the CurlHandle zval it had just
created, leaking one wrapper per denied push and permanently bumping the
parent's clone counter. Factor the per-instance teardown out of
curl_free_obj() into _php_curl_free_instance() and reuse it for the denied
handle.
@iliaal
iliaal force-pushed the fix/curl-push-deny-leak-84 branch from 5064bca to 1538890 Compare September 20, 2026 16:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants