Commit: 8016dc91cb68f9bfdb19c65bda7233eb0ae85196 - system-core (git)

system/core

Commit MetaInfo

• Revision: 8016dc91cb68f9bfdb19c65bda7233eb0ae85196 (tree)
• Time: 2019-12-17 13:15:46
• Author: Andrew Boie <andrew.p.boie@inte...>
• Commiter: Chih-Wei Huang

Log Message

libdiskconfig: HACK Don't do space checks on zero-size images

If an image file is of zero size, assume we just want to expand it
to fit the available images.

Change-Id: If8f22eb12d3a5179960d4359307bb177e3323e8a
Signed-off-by: Andrew Boie <[e-mail]>

Change Summary

• modified: libdiskconfig/config_mbr.c

Incremental Difference

--- a/libdiskconfig/config_mbr.c
+++ b/libdiskconfig/config_mbr.c
@@ -259,11 +259,11 @@ config_mbr(struct disk_info *dinfo)
         }
 
         /* if extended, need 1 lba for ebr */
-        if ((cur_lba + extended) >= dinfo->num_lba)
+        if (dinfo->num_lba && (cur_lba + extended) >= dinfo->num_lba)
             goto nospace;
         else if (pinfo->len_kb != (uint32_t)-1) {
             uint32_t sz_lba = (pinfo->len_kb / dinfo->sect_size) * 1024;
-            if ((cur_lba + sz_lba + extended) > dinfo->num_lba)
+            if (dinfo->num_lba && (cur_lba + sz_lba + extended) > dinfo->num_lba)
                 goto nospace;
         }