The problem is that the check to see if we're at the end is never reached. I

[coreboot.git] / util / cbfstool / fs.c

diff --git a/util/cbfstool/fs.c b/util/cbfstool/fs.c
index 4f7109a83f70996ef9955db0dcffc7cadec91df8..1e4f06907a73a631f437322661e95d2ec72e35be 100644 (file)
--- a/util/cbfstool/fs.c
+++ b/util/cbfstool/fs.c
@@ -227,7 +227,7 @@ struct cbfs_file * rom_alloc(struct rom *rom, const char *name, unsigned long si
        unsigned long nextoffset, truncoffset;
        struct cbfs_file *newfile = NULL;
 
-       while (offset < rom->fssize) {
+       while ((offset + size) < rom->fssize) {
 
                c = (struct cbfs_file *)ROM_PTR(rom, offset);
 
@@ -406,7 +406,7 @@ int rom_add(struct rom *rom, const char *name, void *buffer, unsigned long addre
                c = rom_alloc(rom, name, size, type);
 
        if (c == NULL) {
-               ERROR("There is no more room in this ROM\n");
+               ERROR("There is not enough room in this ROM\n");
                return -1;
        }