diff options
| author | Hanna Czenczek <hreitz@redhat.com> | 2023-02-06 14:29:49 +0100 |
|---|---|---|
| committer | Kevin Wolf <kwolf@redhat.com> | 2023-02-17 11:22:19 +0100 |
| commit | 1e84cf79573e364075d6e63a4b00f7dc5f8aa924 (patch) | |
| tree | 266c3e24ec40376c70b6fe7a6163dfc897bd8550 | |
| parent | 3d2d4cc5a23229088528f9451518f12dea9a7285 (diff) | |
| download | qemu-1e84cf79573e364075d6e63a4b00f7dc5f8aa924.zip qemu-1e84cf79573e364075d6e63a4b00f7dc5f8aa924.tar.gz qemu-1e84cf79573e364075d6e63a4b00f7dc5f8aa924.tar.bz2 | |
curl: Fix error path in curl_open()
g_hash_table_destroy() and g_hash_table_foreach_remove() (called by
curl_drop_all_sockets()) both require the table to be non-NULL, or will
print assertion failures (just print, no abort).
There are several paths in curl_open() that can lead to the out_noclean
label without s->sockets being allocated, so clean it only if it has
been allocated.
Example reproducer:
$ qemu-img info -f http ''
qemu-img: GLib: g_hash_table_foreach_remove: assertion 'hash_table != NULL' failed
qemu-img: GLib: g_hash_table_destroy: assertion 'hash_table != NULL' failed
qemu-img: Could not open '': http curl driver cannot handle the URL '' (does not start with 'http://')
Closes: https://gitlab.com/qemu-project/qemu/-/issues/1475
Suggested-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Hanna Czenczek <hreitz@redhat.com>
Message-Id: <20230206132949.92917-1-hreitz@redhat.com>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
| -rw-r--r-- | block/curl.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/block/curl.c b/block/curl.c index cbada22..ba9977a 100644 --- a/block/curl.c +++ b/block/curl.c @@ -850,8 +850,10 @@ out_noclean: g_free(s->username); g_free(s->proxyusername); g_free(s->proxypassword); - curl_drop_all_sockets(s->sockets); - g_hash_table_destroy(s->sockets); + if (s->sockets) { + curl_drop_all_sockets(s->sockets); + g_hash_table_destroy(s->sockets); + } qemu_opts_del(opts); return -EINVAL; } |