[systemd-commits] src/journal

[Thomas H.P. Andersen]

 src/journal/journal-file.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 4faa70046ca0c1775c8e231179716a78cf3291b1
Author: Thomas Hindoe Paaboel Andersen <phomes at gmail.com>
Date:   Mon Dec 16 23:35:30 2013 +0100

    journal-file: protect against alloca(0)

diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c
index 4009b29..48fdb61 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;