On Jan 15, 2015, at 00:26, Kyle J. McKay wrote:
On Jan 14, 2015, at 11:09, Michael Blume wrote:
On Wed, Jan 14, 2015 at 10:58 AM, Michael Blume
<blume.mike@xxxxxxxxx> wrote:
On Wed, Jan 14, 2015 at 10:48 AM, Michael Blume <blume.mike@xxxxxxxxx
> wrote:
On Wed, Jan 14, 2015 at 10:44 AM, Michael Blume <blume.mike@xxxxxxxxx
> wrote:
On Wed, Jan 14, 2015 at 10:40 AM, Michael Blume <blume.mike@xxxxxxxxx
> wrote:
On Wed, Jan 14, 2015 at 10:20 AM, Michael Blume <blume.mike@xxxxxxxxx
> wrote:
This is a mac with a fresh build of git from pu branch, commit
53b80d0.
With my gitconfig looking like
[user]
email = blume.mike@xxxxxxxxx
name = Michael Blume
[apply]
whitespace = fix
[core]
whitespace = fix,trailing-space,space-before-tab, tab-in-
indent, tabwidth=4
If I run
git clone git@xxxxxxxxxx:MichaelBlume/clojure.git
cd clojure
git checkout origin/rebase-start
git rebase origin/rebase-base
I get
[...]
Applying: CLJ-1295: Speed up dissoc on array-maps
Applying: some throwing
Applying: don't pass offset to ArrayChunk
Applying: make EMPTY accessible
Applying: add handy create methods
Applying: regenerate
Applying: regenerate
/Users/michael.blume/libexec/git-core/git-am: line 854: 92059
Segmentation fault: 11 git apply --index "$dotest/patch" > /
dev/null
2>&1
I can reproduce in a 64-bit v2.1.4 as well, but not in a 32-bit
v2.1.4 build.
My recipe is slightly different to facilitate automation:
cd /tmp
git clone git://github.com/MichaelBlume/clojure.git
cd clojure
git config user.email "blume.mike@xxxxxxxxx"
git config user.name "Michael Blume"
git config apply.whitespace fix
git config core.whitespace \
"fix,trailing-space,space-before-tab, tab-in-indent, tabwidth=4"
git checkout origin/rebase-start
git rebase origin/rebase-base
Looks like v1.7.6.6 64-bit works okay.
Running git bisect run...
5782..2890..1445..722..361..179..91..44..23..13..7..3..1..0
And the winner is (first appearing in v1.8.2.2):
commit 250b3c6c992b3cb04e756eb33bed99442fc55193
Author: Junio C Hamano <gitster@xxxxxxxxx>
Date: Fri Mar 22 11:10:03 2013 -0700
apply --whitespace=fix: avoid running over the postimage buffer
[...]
And just to confirm, building with 250b3c6c^ (which also happens to
be v1.8.0.3) does not fail.
[...]
Running with various MallocCheckHeap and MallocErrorAbort settings
leads to:
git(12926) malloc: *** error for object 0x10040be80: incorrect
checksum for freed object - object was probably modified after being
freed.
And a new backtrace from the core file:
#0 0x00007fff82962da6 at __kill + 10
#1 0x00007fff829c5af8 at szone_error + 476
#2 0x00007fff829c7218 at szone_check + 637
#3 0x00007fff829caaf8 at malloc_zone_check + 42
#4 0x00007fff829cb11d at internal_check + 14
#5 0x00007fff828fc939 at malloc_zone_malloc + 60
#6 0x00007fff828fc8e0 at malloc + 44
#7 0x0000000100131ae4 in xmalloc (size=47378) at wrapper.c:50
#8 0x000000010000950b in update_image (img=0x7fff5fbfe4a0,
applied_pos=1569, preimage=0x7fff5fbfe340, postimage=0x7fff5fbfe310)
at builtin/apply.c:2533
#9 0x0000000100009fa7 in apply_one_fragment (img=0x7fff5fbfe4a0,
frag=0x100400a60, inaccurate_eof=0, ws_rule=3268, nth_fragment=1) at
builtin/apply.c:2808
#10 0x000000010000a760 in apply_fragments (img=0x7fff5fbfe4a0,
patch=0x1004005e0) at builtin/apply.c:2959
#11 0x000000010000b62d in apply_data (patch=0x1004005e0,
st=0x7fff5fbfe510, ce=0x1004072e0) at builtin/apply.c:3340
#12 0x000000010000c0b1 in check_patch (patch=0x1004005e0) at builtin/
apply.c:3559
#13 0x000000010000c157 in check_patch_list (patch=0x1004005e0) at
builtin/apply.c:3574
#14 0x000000010000dc70 in apply_patch (fd=9, filename=0x7fff5fbff1e2
"/private/tmp/clojure/.git/rebase-apply/patch", options=0) at
builtin/apply.c:4189
#15 0x000000010000ea3a in cmd_apply (argc=1, argv=0x7fff5fbfefe0,
prefix_=0x0) at builtin/apply.c:4418
#16 0x0000000100001ae8 in run_builtin (p=0x1001a7070, argc=3,
argv=0x7fff5fbfefe0) at git.c:306
#17 0x0000000100001c9a in handle_internal_command (argc=3,
argv=0x7fff5fbfefe0) at git.c:467
#18 0x0000000100001dab in run_argv (argcp=0x7fff5fbfef9c,
argv=0x7fff5fbfef90) at git.c:513
#19 0x0000000100001ede in main (argc=3, argv=0x7fff5fbfefe0) at
git.c:588
I looked at the code a bit, but a fix does not just jump out at me.
From the debug info it seems pretty clear that some memory's being
stepped on.
If I make this change on top of 250b3c6c:
diff --git a/builtin/apply.c b/builtin/apply.c
index df773c75..8795e830 100644
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -2390,6 +2390,8 @@ static int match_fragment(struct image *img,
fixed_buf = strbuf_detach(&fixed, &fixed_len);
if (postlen < postimage->len)
postlen = 0;
+ if (postlen)
+ postlen = 2 * postimage->len;
update_pre_post_images(preimage, postimage,
fixed_buf, fixed_len, postlen);
return 1;
Then the problem goes away. That seems to suggest that postlen is
being computed incorrectly, but someone more familiar with bulitin/
apply.c is going to need to look at it.
-Kyle
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html