From e201f291b269c70d732778b34de01529aca387b5 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 4 Mar 2014 15:22:15 -0800 Subject: Upgrade to systemd-stable v208 Additional changes in ptest code since now we have directories and not only bunch of files under test/ dir so a simple install does not work anymore we have to cp the files Signed-off-by: Khem Raj Signed-off-by: Saul Wold --- .../journal-file-protect-against-alloca-0.patch | 23 ---------------------- 1 file changed, 23 deletions(-) delete mode 100644 meta/recipes-core/systemd/systemd/journal-file-protect-against-alloca-0.patch (limited to 'meta/recipes-core/systemd/systemd/journal-file-protect-against-alloca-0.patch') diff --git a/meta/recipes-core/systemd/systemd/journal-file-protect-against-alloca-0.patch b/meta/recipes-core/systemd/systemd/journal-file-protect-against-alloca-0.patch deleted file mode 100644 index 953373ee49..0000000000 --- a/meta/recipes-core/systemd/systemd/journal-file-protect-against-alloca-0.patch +++ /dev/null @@ -1,23 +0,0 @@ -From a25fd0d4bd3cf652e55c24e7dc873fe530fa111a Mon Sep 17 00:00:00 2001 -From: Thomas Hindoe Paaboel Andersen -Date: Mon, 16 Dec 2013 23:35:30 +0100 -Subject: [PATCH] journal-file: protect against alloca(0) - ---- - src/journal/journal-file.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c -index 090cf97..8ea258b 100644 ---- a/src/journal/journal-file.c -+++ b/src/journal/journal-file.c -@@ -2737,7 +2737,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 1.2.3-korg