diff options
| author | Peter Maydell | 2021-05-21 15:27:56 +0200 |
|---|---|---|
| committer | Peter Maydell | 2021-05-21 15:27:56 +0200 |
| commit | 3bbaed2cd0a02ee53958d3d2585e837bcf327278 (patch) | |
| tree | 5aa2fb8262bc53f817d6aab6f4a9947ddcf1db40 /ui/spice-display.c | |
| parent | Merge remote-tracking branch 'remotes/vsementsov/tags/pull-simplebench-2021-0... (diff) | |
| parent | ui/gtk: add clipboard support (diff) | |
| download | qemu-3bbaed2cd0a02ee53958d3d2585e837bcf327278.tar.gz qemu-3bbaed2cd0a02ee53958d3d2585e837bcf327278.tar.xz qemu-3bbaed2cd0a02ee53958d3d2585e837bcf327278.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/ui-20210521-pull-request' into staging
ui: add cut+paste support.
ui: bugfixes for spice and vnc.
# gpg: Signature made Fri 21 May 2021 13:50:46 BST
# gpg: using RSA key A0328CFFB93A17A79901FE7D4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" [full]
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>" [full]
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>" [full]
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/ui-20210521-pull-request:
ui/gtk: add clipboard support
ui/gtk: move struct GtkDisplayState to ui/gtk.h
ui/vnc: clipboard support
ui/vdagent: add clipboard support
ui/vdagent: add mouse support
ui/vdagent: core infrastructure
ui: add clipboard documentation
ui: add clipboard infrastructure
build: add separate spice-protocol config option
ui/spice-display: check NULL pointer in interface_release_resource()
vnc: spelling fix (enable->enabled)
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'ui/spice-display.c')
| -rw-r--r-- | ui/spice-display.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ui/spice-display.c b/ui/spice-display.c index d22781a23d..f59c69882d 100644 --- a/ui/spice-display.c +++ b/ui/spice-display.c @@ -561,6 +561,10 @@ static void interface_release_resource(QXLInstance *sin, SimpleSpiceCursor *cursor; QXLCommandExt *ext; + if (!rext.info) { + return; + } + ext = (void *)(intptr_t)(rext.info->id); switch (ext->cmd.type) { case QXL_CMD_DRAW: |