Fossil SCM
segfault on attempted merge.
Closed
c43d2d9477c2d59…
· opened 15 years, 1 month ago
- Type
- Code_Defect
- Priority
- —
- Severity
- Critical
- Resolution
- Fixed
- Subsystem
- —
- Created
- Feb. 28, 2011 9:58 p.m.
attempting to merge an accidental branch results in segfault: backtrace (transcribed by hand):
Program terminated with singal 11, Segmentation fault. #0 0x000000000042a058 in blob_merge (pPivot=0x7f7fffffdb50, pV1=ox7f7fffffda60, pV2=0x7f7fffffdb70, pOut=0x7f7fffffdb30) at ./bld/merge3_.c: 48 #1 0x000000000042a210 in merge_3way (pPivot=0x7f7fffffdb50, zv1=0x7f7ff7b0ef80 "./path/to/file", pV2=0x7f7fffffdb70, pOut=0x7f7fffffdb30 at ./bld/merge3_.c: 398 #2 0x00000000004295bb in merge_cmd () at ./bld/merge_.c:366 #3 0x0000000000425e8f in main (argc=2, argv=0x7f7fffffdc70) at ./bld/main_.c:287
size of file in merge attempt == 21472119 bytes.
bharder added on 2011-03-02 00:37:18 UTC: Fixed per ci [e2122bd620]. Thx drh.