[oe-commits] Maciej Borzecki : wic: IMAGE_BOOT_FILES format checks in bootimg-partition source

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: e56072aaaad6cfa222853a4e9e68dd8aa861de18
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=e56072aaaad6cfa222853a4e9e68dd8aa861de18

Author: Maciej Borzecki <maciej.borzecki at open-rnd.pl>
Date:   Wed Dec 10 12:45:56 2014 +0100

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.

Signed-off-by: Maciej Borzecki <maciej.borzecki at open-rnd.pl>
Signed-off-by: Maciek Borzecki <maciek.borzecki at gmail.com>
Signed-off-by: Ross Burton <ross.burton at intel.com>

---

 scripts/lib/wic/plugins/source/bootimg-partition.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/scripts/lib/wic/plugins/source/bootimg-partition.py b/scripts/lib/wic/plugins/source/bootimg-partition.py
index abf2494..564118a 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)