aboutsummaryrefslogtreecommitdiff
path: root/e2fsck/logfile.c
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-07-07 05:10:34 +0000
committerAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-07-07 05:10:34 +0000
commit8e8408c65078c4f4c171e5cc2b567d6705bed024 (patch)
tree1605641dff9d3858f2b1595d8885bb0fe9496f34 /e2fsck/logfile.c
parent037a031cb6f2d5e4575a3028e3c7135c59ee805a (diff)
parent63687023fc2e8871a718cb4e18458eece2e3460c (diff)
downloade2fsprogs-8e8408c65078c4f4c171e5cc2b567d6705bed024.tar.gz
Change-Id: Ib8f5c32e208ea07a1c7814b337878a6d47c59923
Diffstat (limited to 'e2fsck/logfile.c')
-rw-r--r--e2fsck/logfile.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/e2fsck/logfile.c b/e2fsck/logfile.c
index 63e9a12f..9d79eed2 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;
}
@@ -155,6 +155,9 @@ static void expand_percent_expression(e2fsck_t ctx, char ch,
case 'Y':
sprintf(buf, "%d", tm->tm_year + 1900);
break;
+ default:
+ sprintf(buf, "%%%c", ch);
+ break;
}
append_string(s, buf, 0);
}