From: Kevin Wolf <kwolf@redhat.com>
To: anthony@codemonkey.ws
Cc: kwolf@redhat.com, qemu-devel@nongnu.org
Subject: [Qemu-devel] [PATCH 11/12] bdrv_img_create: Fix segfault
Date: Wed, 8 Jun 2011 15:48:29 +0200 [thread overview]
Message-ID: <1307540910-12398-12-git-send-email-kwolf@redhat.com> (raw)
In-Reply-To: <1307540910-12398-1-git-send-email-kwolf@redhat.com>
Block drivers that don't support creating images don't have a size option. Fail
gracefully instead of segfaulting when trying to access the option's value.
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
block.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/block.c b/block.c
index 3036a2d..24a25d5 100644
--- a/block.c
+++ b/block.c
@@ -2881,7 +2881,7 @@ int bdrv_img_create(const char *filename, const char *fmt,
char *options, uint64_t img_size, int flags)
{
QEMUOptionParameter *param = NULL, *create_options = NULL;
- QEMUOptionParameter *backing_fmt, *backing_file;
+ QEMUOptionParameter *backing_fmt, *backing_file, *size;
BlockDriverState *bs = NULL;
BlockDriver *drv, *proto_drv;
BlockDriver *backing_drv = NULL;
@@ -2964,7 +2964,8 @@ int bdrv_img_create(const char *filename, const char *fmt,
// The size for the image must always be specified, with one exception:
// If we are using a backing file, we can obtain the size from there
- if (get_option_parameter(param, BLOCK_OPT_SIZE)->value.n == -1) {
+ size = get_option_parameter(param, BLOCK_OPT_SIZE);
+ if (size && size->value.n == -1) {
if (backing_file && backing_file->value.s) {
uint64_t size;
char buf[32];
--
1.7.5.2
next prev parent reply other threads:[~2011-06-08 13:45 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-08 13:48 [Qemu-devel] [PULL 00/12] Block patches Kevin Wolf
2011-06-08 13:48 ` [Qemu-devel] [PATCH 01/12] ide/core: Remove explicit setting of BM_STATUS_INT Kevin Wolf
2011-06-08 13:48 ` [Qemu-devel] [PATCH 02/12] block: clarify the meaning of BDRV_O_NOCACHE Kevin Wolf
2011-06-08 13:48 ` [Qemu-devel] [PATCH 03/12] vmdk: fix endianness bugs Kevin Wolf
2011-06-08 13:48 ` [Qemu-devel] [PATCH 04/12] block/raw-posix: use a character device if a block device is given Kevin Wolf
2011-06-08 13:48 ` [Qemu-devel] [PATCH 05/12] block/raw-posix: get right partition size Kevin Wolf
2011-06-08 13:48 ` [Qemu-devel] [PATCH 06/12] rbd: use the higher level librbd instead of just librados Kevin Wolf
2011-06-08 13:48 ` [Qemu-devel] [PATCH 07/12] rbd: allow configuration of rados from the rbd filename Kevin Wolf
2011-06-08 13:48 ` [Qemu-devel] [PATCH 08/12] rbd: check return values when scheduling aio Kevin Wolf
2011-06-08 13:48 ` [Qemu-devel] [PATCH 09/12] rbd: Add bdrv_truncate implementation Kevin Wolf
2011-06-08 13:48 ` [Qemu-devel] [PATCH 10/12] qcow2: Fix memory leaks in error cases Kevin Wolf
2011-06-08 13:48 ` Kevin Wolf [this message]
2011-06-08 13:48 ` [Qemu-devel] [PATCH 12/12] qemu-img create: Fix displayed default cluster size Kevin Wolf
2011-06-09 12:39 ` [Qemu-devel] [PULL 00/12] Block patches Anthony Liguori
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1307540910-12398-12-git-send-email-kwolf@redhat.com \
--to=kwolf@redhat.com \
--cc=anthony@codemonkey.ws \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).