diff options
| author |  Eric Sunshine <sunshine@sunshineco.com> | 2016-03-21 00:35:57 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2016-03-21 09:18:07 -0700 |
| commit | d616fbf256ef3102669d450ddadd8469fefcf95c (patch) | |
| tree | c80ec676a8d8a9914f3be3557028659755217e99 /git-merge-one-file.sh | |
| parent | add helpers for detecting size_t overflow (diff) | |
| download | tgif-d616fbf256ef3102669d450ddadd8469fefcf95c.tar.xz | |
git-compat-util: st_add4: work around gcc 4.2.x compiler crash
Although changes by 5b442c4 (tree-diff: catch integer overflow in
combine_diff_path allocation, 2016-02-19) are perfectly valid, they
unfortunately trigger an internal compiler error in gcc 4.2.x:
combine-diff.c: In function 'diff_tree_combined':
combine-diff.c:1391: internal compiler error: Segmentation fault: 11
Experimentation reveals that changing st_add4()'s argument evaluation
order is sufficient to sidestep this problem.
Although st_add3() does not trigger the compiler bug, for style
consistency, change its argument evaluation order to match.
Signed-off-by: Eric Sunshine <sunshine@sunshineco.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-merge-one-file.sh')
0 files changed, 0 insertions, 0 deletions