Skip to content

fix: error instead of throwing when ditto fails to launch#308

Merged
MarshallOfSound merged 1 commit into
mainfrom
sam/patch-ziparchiver-crash
May 3, 2026
Merged

fix: error instead of throwing when ditto fails to launch#308
MarshallOfSound merged 1 commit into
mainfrom
sam/patch-ziparchiver-crash

Conversation

@MarshallOfSound

Copy link
Copy Markdown
Collaborator

Upstreams fix_crash_when_process_to_extract_zip_cannot_be_launched.patch. New spec re-points the ditto launch path to force a launch failure and asserts the signal errors instead of throwing.


Part of upstreaming electron/patches/squirrel.mac/ into this repo.

[upstream] electron/patches/squirrel.mac/fix_crash_when_process_to_extract_zip_cannot_be_launched.patch

NSTask -launch raises an NSException when the process can't start
(missing binary, sandbox denial, etc.). Use -launchAndReturnError: and
surface the failure as a SQRLZipArchiverShellTaskFailed signal instead.

Adds a spec that points launchPath at a nonexistent binary and asserts
the error path.
@MarshallOfSound MarshallOfSound enabled auto-merge (squash) May 2, 2026 23:16
@MarshallOfSound MarshallOfSound merged commit 3e1692f into main May 3, 2026
9 checks passed
@MarshallOfSound MarshallOfSound deleted the sam/patch-ziparchiver-crash branch May 3, 2026 00:00
MarshallOfSound added a commit to electron/electron that referenced this pull request May 13, 2026
Bumps squirrel.mac from 0e5d146ba1 to 8d808803bc and removes 14 patches
that have been upstreamed into Squirrel/Squirrel.Mac (mainly via
Squirrel/Squirrel.Mac#312, plus Squirrel/Squirrel.Mac#298,
Squirrel/Squirrel.Mac#302, Squirrel/Squirrel.Mac#308). Only
build_add_gn_config.patch remains, slimmed down to GN-only changes
since Squirrel/Squirrel.Mac#298 upstreamed the ReactiveCocoa ->
ReactiveObjC import renames it was carrying.
jkleinsc pushed a commit to electron/electron that referenced this pull request May 14, 2026
* fix: don't return a `nullptr` from `TargetForRect`

Co-authored-by: Noah Gregory <nmggithub@electronjs.org>

* fix: address concerns

Co-authored-by: Noah Gregory <nmggithub@electronjs.org>

* chore: use promise's context for memory dump callback. (#51570)

Co-authored-by: BILL SHEN <15865969+cucbin@users.noreply.github.com>

* build: only fallback to CHROMIUM_BUILDTOOLS_PATH if needed (#51558)

* build: only fallback to CHROMIUM_BUILDTOOLS_PATH if needed

* ci: fix lint workflow detection of src/buildtools

* ci: bump build-tools SHA

Co-authored-by: David Sanders <dsanders11@ucsbalum.com>

* build: update squirrel.mac to 8d808803, drop upstreamed patches (#51584)

Bumps squirrel.mac from 0e5d146ba1 to 8d808803bc and removes 14 patches
that have been upstreamed into Squirrel/Squirrel.Mac (mainly via
Squirrel/Squirrel.Mac#312, plus Squirrel/Squirrel.Mac#298,
Squirrel/Squirrel.Mac#302, Squirrel/Squirrel.Mac#308). Only
build_add_gn_config.patch remains, slimmed down to GN-only changes
since Squirrel/Squirrel.Mac#298 upstreamed the ReactiveCocoa ->
ReactiveObjC import renames it was carrying.

Co-authored-by: Samuel Attard <sam@electronjs.org>

* Revert "build: update squirrel.mac to 8d808803, drop upstreamed patches (#51584)"

This reverts commit d4e9004.

* Revert "build: only fallback to CHROMIUM_BUILDTOOLS_PATH if needed (#51558)"

This reverts commit 090b568.

* Revert "chore: use promise's context for memory dump callback. (#51570)"

This reverts commit a74d8a1.

---------

Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com>
Co-authored-by: Noah Gregory <nmggithub@electronjs.org>
Co-authored-by: BILL SHEN <15865969+cucbin@users.noreply.github.com>
Co-authored-by: David Sanders <dsanders11@ucsbalum.com>
Co-authored-by: Samuel Attard <sam@electronjs.org>
Co-authored-by: Charles Kerr <charles@charleskerr.com>
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.

1 participant