aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaciej Borzecki <maciej.borzecki@open-rnd.pl>2014-12-10 12:45:56 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-12-31 10:17:51 +0000
commitbcc7612dc98b22dc61162a9c403ecc92989d9484 (patch)
tree49af3896adfbfd126fa1b76397f310fa2cea74f1
parent97a90102f5834c317c0d0f4b645fdfa410c27e04 (diff)
downloadopenembedded-core-contrib-bcc7612dc98b22dc61162a9c403ecc92989d9484.tar.gz
wic: IMAGE_BOOT_FILES format checks in bootimg-partition source
Check for malformed entries in IMAGE_BOOT_FILES, fail early if such entries were found. (From OE-Core rev: e56072aaaad6cfa222853a4e9e68dd8aa861de18) Signed-off-by: Maciej Borzecki <maciej.borzecki@open-rnd.pl> Signed-off-by: Maciek Borzecki <maciek.borzecki@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--scripts/lib/wic/plugins/source/bootimg-partition.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/scripts/lib/wic/plugins/source/bootimg-partition.py b/scripts/lib/wic/plugins/source/bootimg-partition.py
index abf24942e8..564118ad8b 100644
--- a/scripts/lib/wic/plugins/source/bootimg-partition.py
+++ b/scripts/lib/wic/plugins/source/bootimg-partition.py
@@ -90,6 +90,8 @@ class BootimgPartitionPlugin(SourcePlugin):
for src_entry in re.findall(r'[\w;\-\./]+', boot_files):
if ';' in src_entry:
dst_entry = tuple(src_entry.split(';'))
+ if not dst_entry[0] or not dst_entry[1]:
+ msger.error('Malformed boot file entry: %s' % (src_entry))
else:
dst_entry = (src_entry, src_entry)