summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Hajnoczi <stefanha@redhat.com>2014-03-26 13:05:57 +0100
committerMichael Roth <mdroth@linux.vnet.ibm.com>2014-07-03 16:18:13 -0500
commit4b50bd735711928869f14824481ac2cbda5333d5 (patch)
tree158fcf0e7f4b83576d0e847c07ceb9a739718e1f
parent4ee5b9c8cbe05d1865924dce226b4c3aedc4dae6 (diff)
downloadqemu-4b50bd735711928869f14824481ac2cbda5333d5.tar.gz
dmg: use appropriate types when reading chunks
Use the right types instead of signed int: size_t new_size; This is a byte count for g_realloc() that is calculated from uint32_t and size_t values. uint32_t chunk_count; Use the same type as s->n_chunks, which is used together with chunk_count. This patch is a cleanup and does not fix bugs. Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> Signed-off-by: Kevin Wolf <kwolf@redhat.com> Reviewed-by: Max Reitz <mreitz@redhat.com> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> (cherry picked from commit eb71803b041f55779ea10d860c0f66df285c68de) Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com>
-rw-r--r--block/dmg.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/block/dmg.c b/block/dmg.c
index 1cc5426d8c..f98c94dc47 100644
--- a/block/dmg.c
+++ b/block/dmg.c
@@ -161,7 +161,8 @@ static int dmg_open(BlockDriverState *bs, QDict *options, int flags,
}
if (type == 0x6d697368 && count >= 244) {
- int new_size, chunk_count;
+ size_t new_size;
+ uint32_t chunk_count;
offset += 4;
offset += 200;