[PULL,02/23] block/curl.c: Set error message string if curl_init_state() fails

Commit Message

Hanna Czenczek March 7, 2022, 10:35 a.m. UTC

From: Peter Maydell <[e-mail]>

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 <[e-mail]>
Message-Id: <[e-mail]>
Reviewed-by: Philippe Mathieu-Daudé <[e-mail]>
Reviewed-by: Hanna Reitz <[e-mail]>
Signed-off-by: Hanna Reitz <[e-mail]>
---
 block/curl.c | 2 ++
 1 file changed, 2 insertions(+)

Patch

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;
     }