git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Ayke van Laethem <aykevanlaethem@gmail.com>
To: git@vger.kernel.org
Subject: Segmentation fault in git cherry-pick
Date: Wed, 31 Jan 2018 22:43:02 +0100	[thread overview]
Message-ID: <CAHZoaj41k0AU-S1cPH3p6gU6EzXfYiMasN7=Cv9SRd2xp=1ThA@mail.gmail.com> (raw)

Hi all,

I've found a segmentation fault in git.

Here, fabsf is a branch that I'm trying to get the topmost commit from.
After the failed cherry-pick, the change is added to the local working
tree, but the commit isn't applied and .git/index.lock still exists.

Version: 2.11.0 (Debian stretch)

~/src/micropython/ports/nrf$ valgrind git cherry-pick fabsf
==23286== Memcheck, a memory error detector
==23286== Copyright (C) 2002-2015, and GNU GPL'd, by Julian Seward et al.
==23286== Using Valgrind-3.12.0.SVN and LibVEX; rerun with -h for copyright info
==23286== Command: git cherry-pick fabsf
==23286==
==23286== Invalid read of size 4
==23286==    at 0x21A348: add_index_entry_with_check (read-cache.c:1012)
==23286==    by 0x21A348: add_index_entry (read-cache.c:1061)
==23286==    by 0x1FAE85: merge_content (merge-recursive.c:1727)
==23286==    by 0x1FBAAC: process_entry (merge-recursive.c:1885)
==23286==    by 0x1FBAAC: merge_trees (merge-recursive.c:1948)
==23286==    by 0x23E2F7: do_recursive_merge (sequencer.c:389)
==23286==    by 0x23E2F7: do_pick_commit (sequencer.c:757)
==23286==    by 0x23FB52: single_pick (sequencer.c:1329)
==23286==    by 0x23FB52: sequencer_pick_revisions (sequencer.c:1378)
==23286==    by 0x1874CE: run_sequencer (revert.c:178)
==23286==    by 0x187927: cmd_cherry_pick (revert.c:203)
==23286==    by 0x11A204: run_builtin (git.c:373)
==23286==    by 0x11A204: handle_builtin (git.c:572)
==23286==    by 0x11A5A1: run_argv (git.c:630)
==23286==    by 0x11A5A1: cmd_main (git.c:707)
==23286==    by 0x1195D1: main (common-main.c:40)
==23286==  Address 0x38 is not stack'd, malloc'd or (recently) free'd
==23286==
==23286==
==23286== Process terminating with default action of signal 11 (SIGSEGV)
==23286==  Access not within mapped region at address 0x38
==23286==    at 0x21A348: add_index_entry_with_check (read-cache.c:1012)
==23286==    by 0x21A348: add_index_entry (read-cache.c:1061)
==23286==    by 0x1FAE85: merge_content (merge-recursive.c:1727)
==23286==    by 0x1FBAAC: process_entry (merge-recursive.c:1885)
==23286==    by 0x1FBAAC: merge_trees (merge-recursive.c:1948)
==23286==    by 0x23E2F7: do_recursive_merge (sequencer.c:389)
==23286==    by 0x23E2F7: do_pick_commit (sequencer.c:757)
==23286==    by 0x23FB52: single_pick (sequencer.c:1329)
==23286==    by 0x23FB52: sequencer_pick_revisions (sequencer.c:1378)
==23286==    by 0x1874CE: run_sequencer (revert.c:178)
==23286==    by 0x187927: cmd_cherry_pick (revert.c:203)
==23286==    by 0x11A204: run_builtin (git.c:373)
==23286==    by 0x11A204: handle_builtin (git.c:572)
==23286==    by 0x11A5A1: run_argv (git.c:630)
==23286==    by 0x11A5A1: cmd_main (git.c:707)
==23286==    by 0x1195D1: main (common-main.c:40)

Note: I'm not subscribed to this mailing list.

--
Ayke

             reply	other threads:[~2018-01-31 21:43 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-01-31 21:43 Ayke van Laethem [this message]
2018-01-31 22:06 ` Segmentation fault in git cherry-pick Elijah Newren
2018-02-03 18:56   ` Ayke van Laethem

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to='CAHZoaj41k0AU-S1cPH3p6gU6EzXfYiMasN7=Cv9SRd2xp=1ThA@mail.gmail.com' \
    --to=aykevanlaethem@gmail.com \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).