Commit bd7ce902 authored by Peter Maydell's avatar Peter Maydell
Browse files

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: default avatarPeter Maydell <peter.maydell@linaro.org>
parents e20c016e dc491cfc

ui/spice-display.c

+4 −0
Original line number Diff line number Diff line
@@ -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.