diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-11-12 15:55:40 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-11-12 15:55:40 +0000 |
| commit | 5704c36d25ee84e7129722cb0db53df9faefe943 (patch) | |
| tree | 67e601d09d95214e590a61513a06d869a4a61a87 /hw | |
| parent | 435cc3e4d515591e15805b1e012564800a130b0f (diff) | |
| parent | f1aba960cc40ab65fa88c8678883bd2201708c55 (diff) | |
Merge remote-tracking branch 'remotes/kraxel/tags/fixes-31-20181112-pull-request' into staging
fixes for 3.1: mark bt as deprecated, bugfixes for pulse, gtk and edid.
# gpg: Signature made Mon 12 Nov 2018 15:14:58 GMT
# gpg: using RSA key 4CB6D8EED3E87138
# 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/fixes-31-20181112-pull-request:
ui/gtk: fix cursor in egl mode
pulseaudio: process audio data in smaller chunks
edid: silence a stringop-overflow warning
bt: Mark the bluetooth subsystem as deprecated
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/display/edid-generate.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/display/edid-generate.c b/hw/display/edid-generate.c index bdf5e1d4d4..77d9127344 100644 --- a/hw/display/edid-generate.c +++ b/hw/display/edid-generate.c @@ -165,7 +165,7 @@ static void edid_desc_text(uint8_t *desc, uint8_t type, if (len > 12) { len = 12; } - strncpy((char *)(desc + 5), text, len); + memcpy(desc + 5, text, len); desc[5 + len] = '\n'; } |