From: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Date: Sun, 28 Mar 2021 13:15:42 +0000 (+0200)
Subject: fsck.c: call parse_msg_type() early in fsck_set_msg_type()
X-Git-Tag: v2.32.0-rc0~102^2~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c72da1a22bb3996ab8740b91ad2af6a54bd22777;p=thirdparty%2Fgit.git

fsck.c: call parse_msg_type() early in fsck_set_msg_type()

There's no reason to defer the calling of parse_msg_type() until after
we've checked if the "id < 0". This is not a hot codepath, and
parse_msg_type() itself may die on invalid input.

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/fsck.c b/fsck.c
index c5a81e4ff0..80365e6284 100644
--- a/fsck.c
+++ b/fsck.c
@@ -201,11 +201,10 @@ void fsck_set_msg_type(struct fsck_options *options,
 		       const char *msg_id_str, const char *msg_type_str)
 {
 	int msg_id = parse_msg_id(msg_id_str);
-	enum fsck_msg_type msg_type;
+	enum fsck_msg_type msg_type = parse_msg_type(msg_type_str);
 
 	if (msg_id < 0)
 		die("Unhandled message id: %s", msg_id_str);
-	msg_type = parse_msg_type(msg_type_str);
 
 	if (msg_type != FSCK_ERROR && msg_id_info[msg_id].msg_type == FSCK_FATAL)
 		die("Cannot demote %s to %s", msg_id_str, msg_type_str);