qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Hanna Reitz <hreitz@redhat.com>
To: qemu-block@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>,
	Peter Maydell <peter.maydell@linaro.org>,
	Hanna Reitz <hreitz@redhat.com>,
	qemu-devel@nongnu.org
Subject: [PULL 02/23] block/curl.c: Set error message string if curl_init_state() fails
Date: Mon,  7 Mar 2022 11:35:28 +0100	[thread overview]
Message-ID: <20220307103549.808809-3-hreitz@redhat.com> (raw)
In-Reply-To: <20220307103549.808809-1-hreitz@redhat.com>

From: Peter Maydell <peter.maydell@linaro.org>

In curl_open(), the 'out' label assumes that the state->errmsg string
has been set (either by curl_easy_perform() or by manually copying a
string into it); however if curl_init_state() fails we will jump to
that label without setting the string.  Add the missing error string
setup.

(We can't be specific about the cause of failure: the documentation
of curl_easy_init() just says "If this function returns NULL,
something went wrong".)

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Message-Id: <20220222152341.850419-2-peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Hanna Reitz <hreitz@redhat.com>
Signed-off-by: Hanna Reitz <hreitz@redhat.com>
---
 block/curl.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/block/curl.c b/block/curl.c
index 6a6cd72975..9516852971 100644
--- a/block/curl.c
+++ b/block/curl.c
@@ -759,6 +759,8 @@ static int curl_open(BlockDriverState *bs, QDict *options, int flags,
     // Get file size
 
     if (curl_init_state(s, state) < 0) {
+        pstrcpy(state->errmsg, CURL_ERROR_SIZE,
+                "curl library initialization failed.");
         goto out;
     }
 
-- 
2.34.1



  parent reply	other threads:[~2022-03-07 11:07 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-03-07 10:35 [PULL 00/23] Block patches Hanna Reitz
2022-03-07 10:35 ` [PULL 01/23] ide: Increment BB in-flight counter for TRIM BH Hanna Reitz
2022-03-07 10:35 ` Hanna Reitz [this message]
2022-03-07 10:35 ` [PULL 03/23] block/curl.c: Check error return from curl_easy_setopt() Hanna Reitz
2022-03-07 10:35 ` [PULL 04/23] block: fix preallocate filter: don't do unaligned preallocate requests Hanna Reitz
2022-03-07 10:35 ` [PULL 05/23] tests/qemu-iotests/040: Skip TestCommitWithFilters without 'throttle' Hanna Reitz
2022-03-07 10:35 ` [PULL 06/23] tests/qemu-iotests/testrunner: Quote "case not run" lines in TAP mode Hanna Reitz
2022-03-07 10:35 ` [PULL 07/23] iotests: Write test output to TEST_DIR Hanna Reitz
2022-03-07 10:35 ` [PULL 08/23] block/block-copy: move copy_bitmap initialization to block_copy_state_new() Hanna Reitz
2022-03-07 10:35 ` [PULL 09/23] block/dirty-bitmap: bdrv_merge_dirty_bitmap(): add return value Hanna Reitz
2022-03-07 10:35 ` [PULL 10/23] block/block-copy: block_copy_state_new(): add bitmap parameter Hanna Reitz
2022-03-07 10:35 ` [PULL 11/23] block/copy-before-write: add bitmap open parameter Hanna Reitz
2022-03-07 10:35 ` [PULL 12/23] block/block-copy: add block_copy_reset() Hanna Reitz
2022-03-07 10:35 ` [PULL 13/23] block: intoduce reqlist Hanna Reitz
2022-03-07 10:35 ` [PULL 14/23] block/reqlist: reqlist_find_conflict(): use ranges_overlap() Hanna Reitz
2022-03-07 10:35 ` [PULL 15/23] block/dirty-bitmap: introduce bdrv_dirty_bitmap_status() Hanna Reitz
2022-03-07 10:35 ` [PULL 16/23] block/reqlist: add reqlist_wait_all() Hanna Reitz
2022-03-07 10:35 ` [PULL 17/23] block/io: introduce block driver snapshot-access API Hanna Reitz
2022-03-07 10:35 ` [PULL 18/23] block: introduce snapshot-access block driver Hanna Reitz
2022-03-07 10:35 ` [PULL 19/23] block: copy-before-write: realize snapshot-access API Hanna Reitz
2022-03-07 10:35 ` [PULL 20/23] iotests/image-fleecing: add test-case for fleecing format node Hanna Reitz
2022-03-07 10:35 ` [PULL 21/23] iotests.py: add qemu_io_pipe_and_status() Hanna Reitz
2022-03-07 10:35 ` [PULL 22/23] iotests/image-fleecing: add test case with bitmap Hanna Reitz
2022-03-07 10:35 ` [PULL 23/23] iotests/image-fleecing: test push backup with fleecing Hanna Reitz
2022-03-07 19:07 ` [PULL 00/23] Block patches Peter Maydell

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=20220307103549.808809-3-hreitz@redhat.com \
    --to=hreitz@redhat.com \
    --cc=kwolf@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-block@nongnu.org \
    --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).