]> code.ossystems Code Review - openembedded-core.git/commitdiff
wic: IMAGE_BOOT_FILES format checks in bootimg-partition source
authorMaciej Borzecki <maciej.borzecki@open-rnd.pl>
Wed, 10 Dec 2014 11:45:56 +0000 (12:45 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Wed, 31 Dec 2014 10:17:51 +0000 (10:17 +0000)
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>
scripts/lib/wic/plugins/source/bootimg-partition.py

index abf24942e8789d333fa4a6d7c295a1d09abb9ac3..564118ad8ba8f53ae5dfe298825be3a4c10e874a 100644 (file)
@@ -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)