Re: Null pointer dereference in rerere.c

2018-10-01 Thread Ruud van Asseldonk
> I do believe this bug may actually be fixed in master, by 93406a282f > ("rerere: fix crash with files rerere can't handle", 2018-08-05). Do > you by any chance remember if you committed a file that contained > conflict markers during the rebase at some point? I might have, but I am not 100% sur

Re: Null pointer dereference in rerere.c

2018-09-27 Thread Thomas Gummerer
On 09/27, Ruud van Asseldonk wrote: > Hi, > > I just ran into a segmentation fault during a rebase with rerere > enabled. Inspecting the core dump with gdb shows: Thanks for reporting this bug > (gdb) bt > #0 0x55d673375ce0 in do_rerere_one_path (update=0x7fff03c37f30, > rr_item=0x55d6746d0

Re: Null pointer dereference in rerere.c

2018-09-27 Thread Duy Nguyen
On Thu, Sep 27, 2018 at 10:24 AM Ruud van Asseldonk wrote: > Please let me know if there is anything I can do to help diagnose the > problem. Nothing yet but please keep the core dump. We might be able to dig some more out of it to confirm if we find something suspicious. -- Duy

Null pointer dereference in rerere.c

2018-09-27 Thread Ruud van Asseldonk
Hi, I just ran into a segmentation fault during a rebase with rerere enabled. Inspecting the core dump with gdb shows: (gdb) bt #0 0x55d673375ce0 in do_rerere_one_path (update=0x7fff03c37f30, rr_item=0x55d6746d0b30) at rerere.c:755 #1 do_plain_rerere (fd=3, rr=0x7fff03c37ef0) at rerere.c:85