From: zhanchengbin <zhanchengbin1@huawei.com>
Date: Fri, 31 Dec 2021 07:41:41 +0000 (+0800)
Subject: e2fsck: handle malloc() failure when computing the log file name
X-Git-Tag: v1.46.6-rc1~59
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=a26abc5a1e2fff9d679887445d313b4b9f946f64;p=tools%2Fe2fsprogs.git

e2fsck: handle malloc() failure when computing the log file name

Link: https://lore.kernel.org/r/6d2844c7-0fd2-e432-3c7e-bb8de8c8a186@huawei.com
Signed-off-by: zhanchengbin <zhanchengbin1@huawei.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
---

diff --git a/e2fsck/logfile.c b/e2fsck/logfile.c
index 63e9a12..7bdeae1 100644
--- a/e2fsck/logfile.c
+++ b/e2fsck/logfile.c
@@ -32,7 +32,7 @@ static void alloc_string(struct string *s, int len)
 {
 	s->s = malloc(len);
 /* e2fsck_allocate_memory(ctx, len, "logfile name"); */
-	s->len = len;
+	s->len = s->s ? len : 0;
 	s->end = 0;
 }