git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Shawn Pearce <spearce@spearce.org>
To: Linus Torvalds <torvalds@osdl.org>
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>,
	Junio C Hamano <junkio@cox.net>,
	git@vger.kernel.org
Subject: Re: Segfault in xdl_merge is back
Date: Wed, 27 Dec 2006 03:24:40 -0500	[thread overview]
Message-ID: <20061227082440.GC23022@spearce.org> (raw)
In-Reply-To: <Pine.LNX.4.64.0612262245250.4473@woody.osdl.org>

Linus Torvalds <torvalds@osdl.org> wrote:
> On Tue, 26 Dec 2006, Shawn Pearce wrote:
> > 
> > I'm suspecting this is actually some sort of memory corruption in
> > the heap (due to a bad malloc/free) as the bug seems to rear its
> > head only based on the data we are allocating/have allocated.
> 
> Can you try to reproduce it under Linux and use "valgrind" to run the 
> thing that SIGSEGV's? That tends to be a pretty good way to debug bad 
> allocations..
> 
> So instead of bisecting it on cygwin, try to use the build that broke on 
> Linux too (ie undo the 5caf9232 "fix") and when you can reproduce it under 
> Linux, compiel withour -O2 and with debug information, and gdb will be a 
> lot more useful, but also run it with valgrind..

Good advice.  Unfortunately it may be difficult to get valgrind onto
a Linux system where I can also put that repository which is failing.

Junio suggested that I try running git-merge-file on the three
blobs that I'm segfaulting on.  That's a pretty quick test.

Failing that I may have to find a way to get valgrind onto a Linux
system - but that could take a month or more.  (The UNIX admins
are overworked and don't care much about Linux, and I don't have
my own Linux system there.)

I'd really like to get this segfault fixed before 1.5.0 ships. Its
a rather nasty bug and I suspect the culprit is already in 1.5.0-rc0.

-- 
Shawn.

  reply	other threads:[~2006-12-27  8:24 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2006-12-27  4:16 Segfault in xdl_merge is back Shawn Pearce
2006-12-27  6:49 ` Linus Torvalds
2006-12-27  8:24   ` Shawn Pearce [this message]
2006-12-27 11:22 ` Johannes Schindelin
2006-12-27 12:53   ` Alexandre Julliard
2006-12-28 16:13     ` [PATCH] xdl_merge(): fix a segmentation fault when refining conflicts Johannes Schindelin
2006-12-28 22:09       ` Junio C Hamano
2006-12-29  4:16       ` Shawn Pearce
2006-12-30 18:53         ` Johannes Schindelin
2006-12-30 19:47           ` Jakub Narebski
2006-12-31  1:09             ` Johannes Schindelin
2007-01-02 13:18               ` Jakub Narebski
2007-01-02 20:58                 ` Johannes Schindelin
2007-01-02 21:11                   ` Junio C Hamano
2007-01-02 21:17                     ` Johannes Schindelin

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=20061227082440.GC23022@spearce.org \
    --to=spearce@spearce.org \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=junkio@cox.net \
    --cc=torvalds@osdl.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).