From 4faa70046ca0c1775c8e231179716a78cf3291b1 Mon Sep 17 00:00:00 2001 From: Thomas Hindoe Paaboel Andersen Date: Mon, 16 Dec 2013 23:35:30 +0100 Subject: journal-file: protect against alloca(0) --- src/journal/journal-file.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/journal') diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c index 4009b29b46..48fdb6163a 100644 --- a/src/journal/journal-file.c +++ b/src/journal/journal-file.c @@ -2730,7 +2730,8 @@ int journal_file_copy_entry(JournalFile *from, JournalFile *to, Object *o, uint6 ts.realtime = le64toh(o->entry.realtime); n = journal_file_entry_n_items(o); - items = alloca(sizeof(EntryItem) * n); + /* alloca() can't take 0, hence let's allocate at least one */ + items = alloca(sizeof(EntryItem) * MAX(1u, n)); for (i = 0; i < n; i++) { uint64_t l, h; -- cgit v1.2.3-54-g00ecf