From: malc Date: Thu, 21 May 2009 01:40:23 +0000 (+0400) Subject: Do not attempt to allocate sn_tab when there are no snapshots X-Git-Tag: v0.11.0-rc0~557 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eb0b64f7aa7f6f325aac878265ee9e6c2fc1bf51;p=thirdparty%2Fqemu.git Do not attempt to allocate sn_tab when there are no snapshots This was caught by a7d27b536ffc0773028a90f14580552c0c3ddb2a which aborted on this attempt, thanks to Alex Ivanov for report. Signed-off-by: malc --- diff --git a/block/qcow2.c b/block/qcow2.c index a6de9b6919a..33f329992fe 100644 --- a/block/qcow2.c +++ b/block/qcow2.c @@ -2259,6 +2259,11 @@ static int qcow_snapshot_list(BlockDriverState *bs, QCowSnapshot *sn; int i; + if (!s->nb_snapshots) { + *psn_tab = NULL; + return s->nb_snapshots; + } + sn_tab = qemu_mallocz(s->nb_snapshots * sizeof(QEMUSnapshotInfo)); for(i = 0; i < s->nb_snapshots; i++) { sn_info = sn_tab + i;