-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
git-mailinfo: Fix getting the subject from the in-body [PATCH] line
"Subject: " isn't in the static array "header", and thus memcmp("Subject:", header[i], 7) will never match. Even if it did so, hdr_data[] may not have been allocated if there weren't a "Subject: " in-body when we process "[PATCH]" in the affected codepath. Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se> Signed-off-by: Junio C Hamano <gitster@pobox.com>
- Loading branch information
Lukas Sandström
authored and
Junio C Hamano
committed
Jul 14, 2008
1 parent
b495818
commit e9fe804
Showing
7 changed files
with
104 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
From b9704a518e21158433baa2cc2d591fea687967f6 Mon Sep 17 00:00:00 2001 | ||
From: =?UTF-8?q?Lukas=20Sandstr=C3=B6m?= <lukass@etek.chalmers.se> | ||
Date: Thu, 10 Jul 2008 23:41:33 +0200 | ||
Subject: Re: discussion that lead to this patch | ||
MIME-Version: 1.0 | ||
Content-Type: text/plain; charset=UTF-8 | ||
Content-Transfer-Encoding: 8bit | ||
|
||
[PATCH] git-mailinfo: Fix getting the subject from the body | ||
|
||
"Subject: " isn't in the static array "header", and thus | ||
memcmp("Subject: ", header[i], 7) will never match. | ||
|
||
Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se> | ||
Signed-off-by: Junio C Hamano <gitster@pobox.com> | ||
--- | ||
builtin-mailinfo.c | 2 +- | ||
1 files changed, 1 insertions(+), 1 deletions(-) | ||
|
||
diff --git a/builtin-mailinfo.c b/builtin-mailinfo.c | ||
index 962aa34..2d1520f 100644 | ||
--- a/builtin-mailinfo.c | ||
+++ b/builtin-mailinfo.c | ||
@@ -334,7 +334,7 @@ static int check_header(char *line, unsigned linesize, char **hdr_data, int over | ||
return 1; | ||
if (!memcmp("[PATCH]", line, 7) && isspace(line[7])) { | ||
for (i = 0; header[i]; i++) { | ||
- if (!memcmp("Subject: ", header[i], 9)) { | ||
+ if (!memcmp("Subject", header[i], 7)) { | ||
if (! handle_header(line, hdr_data[i], 0)) { | ||
return 1; | ||
} | ||
-- | ||
1.5.6.2.455.g1efb2 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
Author: Lukas Sandström | ||
Email: lukass@etek.chalmers.se | ||
Subject: git-mailinfo: Fix getting the subject from the body | ||
Date: Thu, 10 Jul 2008 23:41:33 +0200 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
"Subject: " isn't in the static array "header", and thus | ||
memcmp("Subject: ", header[i], 7) will never match. | ||
|
||
Signed-off-by: Lukas Sandström <lukass@etek.chalmers.se> | ||
Signed-off-by: Junio C Hamano <gitster@pobox.com> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
--- | ||
builtin-mailinfo.c | 2 +- | ||
1 files changed, 1 insertions(+), 1 deletions(-) | ||
|
||
diff --git a/builtin-mailinfo.c b/builtin-mailinfo.c | ||
index 962aa34..2d1520f 100644 | ||
--- a/builtin-mailinfo.c | ||
+++ b/builtin-mailinfo.c | ||
@@ -334,7 +334,7 @@ static int check_header(char *line, unsigned linesize, char **hdr_data, int over | ||
return 1; | ||
if (!memcmp("[PATCH]", line, 7) && isspace(line[7])) { | ||
for (i = 0; header[i]; i++) { | ||
- if (!memcmp("Subject: ", header[i], 9)) { | ||
+ if (!memcmp("Subject", header[i], 7)) { | ||
if (! handle_header(line, hdr_data[i], 0)) { | ||
return 1; | ||
} | ||
-- | ||
1.5.6.2.455.g1efb2 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters