From feba23b14340965b9dad9251ec9a7a47313fbf69 Mon Sep 17 00:00:00 2001 From: Pavel Borzenkov Date: Tue, 18 Oct 2011 21:17:35 +0400 Subject: qed: don't pass NULL to memcpy Spotted by Clang Analyzer [Note this memcpy call has always been safe because the length will be 0 when the pointer is NULL] Signed-off-by: Pavel Borzenkov Signed-off-by: Stefan Hajnoczi --- block/qed.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'block/qed.c') diff --git a/block/qed.c b/block/qed.c index e87dc4decf..7fab155b1a 100644 --- a/block/qed.c +++ b/block/qed.c @@ -1425,8 +1425,10 @@ static int bdrv_qed_change_backing_file(BlockDriverState *bs, memcpy(buffer, &le_header, sizeof(le_header)); buffer_len = sizeof(le_header); - memcpy(buffer + buffer_len, backing_file, backing_file_len); - buffer_len += backing_file_len; + if (backing_file) { + memcpy(buffer + buffer_len, backing_file, backing_file_len); + buffer_len += backing_file_len; + } /* Write new header */ ret = bdrv_pwrite_sync(bs->file, 0, buffer, buffer_len); -- cgit v1.2.3 From 512a2cf8e9c52ac72cace5572eed16f9003cd11c Mon Sep 17 00:00:00 2001 From: Pavel Borzenkov Date: Tue, 18 Oct 2011 21:17:56 +0400 Subject: qed: remove unneeded variable assignment 'ret' is unconditionally overwitten by qed_read_l1_table_sync() Spotted by Clang Analyzer Signed-off-by: Pavel Borzenkov Signed-off-by: Stefan Hajnoczi --- block/qed.c | 1 - 1 file changed, 1 deletion(-) (limited to 'block/qed.c') diff --git a/block/qed.c b/block/qed.c index 7fab155b1a..e6720dbd6f 100644 --- a/block/qed.c +++ b/block/qed.c @@ -388,7 +388,6 @@ static int bdrv_qed_open(BlockDriverState *bs, int flags) if (ret < 0) { return ret; } - ret = 0; /* ret should always be 0 or -errno */ qed_header_le_to_cpu(&le_header, &s->header); if (s->header.magic != QED_MAGIC) { -- cgit v1.2.3