diff options
| author | Jonathan Nieder <jrnieder@gmail.com> | 2010-05-08 18:17:29 -0500 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-05-08 16:56:21 -0700 |
| commit | 43acff34b902c38808ac0f326090f2516250e1f0 (patch) | |
| tree | bf0e0cf529f21c35a0a42fe4cd45f9301a8e0228 | |
| parent | e5bd0a1b362ecc4bcd03a4d3628c7e78f861f3ca (diff) | |
| download | git-43acff34b902c38808ac0f326090f2516250e1f0.tar.gz git-43acff34b902c38808ac0f326090f2516250e1f0.tar.xz | |
cherry-pick: do not dump core when iconv fails
When cherry-picking, usually the new and old commit encodings are both
UTF-8. Most old iconv implementations do not support this trivial
conversion, so on old platforms, out->message remains NULL, and later
attempts to read it segfault.
Fix this by noticing the input and output encodings match and skipping
the iconv step, like the other reencode_string() call sites already do.
Also stop segfaulting on other iconv failures: if iconv fails for some
other reason, the best we can do is to pass the old message through.
This fixes a regression introduced in v1.7.1-rc0~15^2~2 (revert:
clarify label on conflict hunks, 2010-03-20).
Reported-by: Andreas Krey <a.krey@gmx.de>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | builtin/revert.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/builtin/revert.c b/builtin/revert.c index 778a56eb5..7d68ef714 100644 --- a/builtin/revert.c +++ b/builtin/revert.c @@ -109,8 +109,13 @@ static int get_message(const char *raw_message, struct commit_message *out) encoding = "UTF-8"; if (!git_commit_encoding) git_commit_encoding = "UTF-8"; - if ((out->reencoded_message = reencode_string(raw_message, - git_commit_encoding, encoding))) + + out->reencoded_message = NULL; + out->message = raw_message; + if (strcmp(encoding, git_commit_encoding)) + out->reencoded_message = reencode_string(raw_message, + git_commit_encoding, encoding); + if (out->reencoded_message) out->message = out->reencoded_message; abbrev = find_unique_abbrev(commit->object.sha1, DEFAULT_ABBREV); |