aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2016-10-28 09:58:38 +0100
committerPeter Maydell <peter.maydell@linaro.org>2016-10-28 09:58:38 +0100
commitb67d87f96924ac2021f6ee8d9a4104b003e35664 (patch)
tree92a5de5285ad3e5c0f538e18820082c820fddafb
parentdb4df20de86c6e8ecd6c9f042c029ffb9f9cddac (diff)
parentcb3a0522b694cc5bb6424497b3f828ccd28fd1dd (diff)
downloadqemu-b67d87f96924ac2021f6ee8d9a4104b003e35664.zip
qemu-b67d87f96924ac2021f6ee8d9a4104b003e35664.tar.gz
qemu-b67d87f96924ac2021f6ee8d9a4104b003e35664.tar.bz2
Merge remote-tracking branch 'remotes/kraxel/tags/pull-vga-20161027-1' into staging
virtio-gpu: fix memory leak in virtio_gpu_resource_create_2d # gpg: Signature made Thu 27 Oct 2016 15:32:38 BST # gpg: using RSA key 0x4CB6D8EED3E87138 # gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" # gpg: aka "Gerd Hoffmann <gerd@kraxel.org>" # gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>" # Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138 * remotes/kraxel/tags/pull-vga-20161027-1: virtio-gpu: fix memory leak in virtio_gpu_resource_create_2d Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
-rw-r--r--hw/display/virtio-gpu.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c
index fa6fd0e..60bce94 100644
--- a/hw/display/virtio-gpu.c
+++ b/hw/display/virtio-gpu.c
@@ -333,6 +333,7 @@ static void virtio_gpu_resource_create_2d(VirtIOGPU *g,
qemu_log_mask(LOG_GUEST_ERROR,
"%s: host couldn't handle guest format %d\n",
__func__, c2d.format);
+ g_free(res);
cmd->error = VIRTIO_GPU_RESP_ERR_INVALID_PARAMETER;
return;
}