cbfstool: prepare moving tests earlier
The assert() makes sure the if() holds true. But that assert won't survive for long. Change-Id: Iab7d2bc7bfebb3f3b3ce70dc5bd041902e14bd7a Signed-off-by: Patrick Georgi <pgeorgi@google.com> Reviewed-on: http://review.coreboot.org/11220 Tested-by: build bot (Jenkins) Reviewed-by: Aaron Durbin <adurbin@chromium.org>
This commit is contained in:
parent
57edf16be5
commit
db01ddfd49
|
@ -616,18 +616,20 @@ int cbfs_add_entry(struct cbfs_image *image, struct buffer *buffer,
|
|||
// We need to put content here, and the case is really
|
||||
// complicated...
|
||||
assert(content_offset);
|
||||
if (addr_next < content_offset) {
|
||||
DEBUG("Not for specified offset yet");
|
||||
continue;
|
||||
} else if (addr > content_offset) {
|
||||
DEBUG("Exceed specified content_offset.");
|
||||
break;
|
||||
} else if (addr + header_size > content_offset) {
|
||||
ERROR("Not enough space for header.\n");
|
||||
break;
|
||||
} else if (content_offset + buffer->size > addr_next) {
|
||||
ERROR("Not enough space for content.\n");
|
||||
break;
|
||||
if (content_offset > 0) {
|
||||
if (addr_next < content_offset) {
|
||||
DEBUG("Not for specified offset yet");
|
||||
continue;
|
||||
} else if (addr > content_offset) {
|
||||
DEBUG("Exceed specified content_offset.");
|
||||
break;
|
||||
} else if (addr + header_size > content_offset) {
|
||||
ERROR("Not enough space for header.\n");
|
||||
break;
|
||||
} else if (content_offset + buffer->size > addr_next) {
|
||||
ERROR("Not enough space for content.\n");
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
// TODO there are more few tricky cases that we may
|
||||
|
|
Loading…
Reference in New Issue