diff options
| -rw-r--r-- | qtest.c | 2 | ||||
| -rw-r--r-- | tests/libqtest.c | 12 |
2 files changed, 13 insertions, 1 deletions
@@ -430,6 +430,8 @@ static void qtest_process_command(CharBackend *chr, gchar **words) g_assert(words[1] && words[2]); g_assert(qemu_strtoull(words[1], NULL, 0, &addr) == 0); g_assert(qemu_strtoull(words[2], NULL, 0, &len) == 0); + /* We'd send garbage to libqtest if len is 0 */ + g_assert(len); data = g_malloc(len); cpu_physical_memory_read(addr, data, len); diff --git a/tests/libqtest.c b/tests/libqtest.c index 6f6975248f..d8fba6647a 100644 --- a/tests/libqtest.c +++ b/tests/libqtest.c @@ -768,6 +768,10 @@ void qtest_memread(QTestState *s, uint64_t addr, void *data, size_t size) gchar **args; size_t i; + if (!size) { + return; + } + qtest_sendf(s, "read 0x%" PRIx64 " 0x%zx\n", addr, size); args = qtest_rsp(s, 2); @@ -858,7 +862,13 @@ void qtest_memwrite(QTestState *s, uint64_t addr, const void *data, size_t size) { const uint8_t *ptr = data; size_t i; - char *enc = g_malloc(2 * size + 1); + char *enc; + + if (!size) { + return; + } + + enc = g_malloc(2 * size + 1); for (i = 0; i < size; i++) { sprintf(&enc[i * 2], "%02x", ptr[i]); |