Message ID | 1376406680-16302-53-git-send-email-mdroth@linux.vnet.ibm.com |
---|---|
State | New |
Headers | show |
diff --git a/hw/core/loader.c b/hw/core/loader.c index 7507914..8514eaf 100644 --- a/hw/core/loader.c +++ b/hw/core/loader.c @@ -779,9 +779,6 @@ int rom_copy(uint8_t *dest, hwaddr addr, size_t size) if (rom->addr > end) { break; } - if (!rom->data) { - continue; - } d = dest + (rom->addr - addr); s = rom->data; @@ -791,7 +788,9 @@ int rom_copy(uint8_t *dest, hwaddr addr, size_t size) l = dest - d; } - memcpy(d, s, l); + if (l > 0) { + memcpy(d, s, l); + } if (rom->romsize > rom->datasize) { /* If datasize is less than romsize, it means that we didn't