diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-04-07 12:48:34 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-04-07 12:48:34 +0100 |
| commit | bd7ce902ab2b5e4f5cd53e1e032d89789b6932a8 (patch) | |
| tree | f43f640c2d8e0bcb75d4b86ebb121605efb637c5 | |
| parent | e20c016e322e0c977ab332322c3a882c119eb1d4 (diff) | |
| parent | dc491cfc14074064ed54a872b62cce6ca1330644 (diff) | |
| download | qemu-bd7ce902ab2b5e4f5cd53e1e032d89789b6932a8.zip qemu-bd7ce902ab2b5e4f5cd53e1e032d89789b6932a8.tar.gz qemu-bd7ce902ab2b5e4f5cd53e1e032d89789b6932a8.tar.bz2 | |
Merge remote-tracking branch 'remotes/spice/tags/pull-spice-6' into staging
spice: monitors_config: check pointer before dereferencing
# gpg: Signature made Mon 07 Apr 2014 11:19:19 BST using RSA key ID D3E87138
# 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>"
* remotes/spice/tags/pull-spice-6:
spice: monitors_config: check pointer before dereferencing
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -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 e28698c..ce6b220 100644 --- a/ui/spice-display.c +++ b/ui/spice-display.c @@ -549,6 +549,10 @@ static int interface_client_monitors_config(QXLInstance *sin, QemuUIInfo info; int rc; + if (!mc) { + return 1; + } + /* * FIXME: multihead is tricky due to the way * spice has multihead implemented. |