patch: Crashes if no options between chunks

[sciurius]

If there is no data between patch chunks, patch will crash.

Easy fix:

*** patch~	2025-07-17 11:34:43.984425703 +0200
--- patch	2025-07-17 11:48:32.880387160 +0200
***************
*** 375,380 ****
--- 375,381 ----
      my $class = "Patch::\u$type";
  
      my ($options, $garbage) = @{$_[0]}{'options', 'garbage'};
+     $options //= [];
  
      # New hunk, same patch.
      $_[0]{hunk}++, return 1 if $_[0]->isa($class) && ! @$garbage;

[briandfoy]

Can you show me an example of a patch that causes the program to crash?

[sciurius]

Hi brian,

patchfail.zip

$ mkdir foo
$ cd foo
$ unzip ../patchfail.zip
$ patch -p1 < x.patch
Hmm...  Looks like a unified diff to me...
The text leading up to this was:
--------------------------
|diff --git a/include/wx/propgrid/advprops.h b/include/wx/propgrid/advprops.h
|index 4a77d5b27577..f8a8e480ecef 100644
|--- a/include/wx/propgrid/advprops.h
|+++ b/include/wx/propgrid/advprops.h
--------------------------
Patching file include/wx/propgrid/advprops.h using Plan A...
Hunk #1 succeeded at 159.
Can't use an undefined value as an ARRAY reference at /home/jv/tmp/patch line 387, <$in_fh> line 803.
Exit 2

HTH,
Johan

[briandfoy]

Thanks. If I haven't fixed this by Monday, ping me to tell me to stop being so lazy.

And, if you want to make a pullrequest, that works too, which makes it easy to give you credit in the git history. goes to look at your profile Oh, it's you. Okay, long time no talk.

[briandfoy]

I wonder if we have the same problem with $garbage.

[sciurius]

I ran across this while working on Alien::wxWidgets. It has a local copy of (an old version) of patch and failed to apply a big, github-generated patch. I updated the local copy to the most recent version only to find out that it still choked. I applied the fix as mentioned in OP then it worked. No $garbage problems.

[briandfoy]

This is part of 1.052. Thanks,