]> rtime.felk.cvut.cz Git - lisovros/qemu_apohw.git/commitdiff
Merge remote-tracking branch 'remotes/kraxel/tags/pull-vnc-20140701-1' into staging
authorPeter Maydell <peter.maydell@linaro.org>
Tue, 1 Jul 2014 14:12:05 +0000 (15:12 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Tue, 1 Jul 2014 14:12:05 +0000 (15:12 +0100)
vnc: two bugfixes (by Peter Lieven).

# gpg: Signature made Tue 01 Jul 2014 12:32: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/kraxel/tags/pull-vnc-20140701-1:
  ui/vnc: fix potential memory corruption issues
  ui/vnc: limit client_cut_text msg payload size

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

Trivial merge