XLibre/xf86-video-intel
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-video-intel.git synced 2026-03-24 01:24:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

intel-virtual-output: Mode names are freed with ScreenResources

Browse Source 
So we have to be careful not to continue to reference the strings after
they may be freed.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson
2014-03-14 14:34:48 +00:00
parent c64d2572ba
commit 5079830bd5
1 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
tools/virtual.c
View File

@@ -1151,9 +1151,9 @@ static int context_update(struct context *ctx)
RRCrtc rr_crtc;
Status ret;
DBG(("%s: copying configuration from %s (mode=%ld: %s) to %s\n",
DBG(("%s: copying configuration from %s (mode=%ld: %dx%d) to %s\n",
DisplayString(dst->dpy),
src->name, (long)src->mode.id, src->mode.name,
src->name, (long)src->mode.id, src->mode.width, src->mode.height,
dst->name));
if (src->mode.id == 0) {
@@ -1188,15 +1188,20 @@ err:
/* XXX User names must be unique! */
m = src->mode;
m.nameLength = snprintf(buf, sizeof(buf),
"%s.%ld-%s", src->name, (long)src->mode.id, src->mode.name);
"%s.%ld-%dx%d", src->name,
(long)src->mode.id,
src->mode.width,
src->mode.height);
m.name = buf;
id = XRRCreateMode(dst->dpy, dst->window, &m);
if (id) {
DBG(("%s: adding mode %ld: %s to %s\n",
DBG(("%s: adding mode %ld: %dx%d to %s, new mode %ld\n",
DisplayString(dst->dpy),
(long)id, src->mode.name,
dst->name));
(long)src->mode.id,
src->mode.width,
src->mode.height,
dst->name (long)id,));
XRRAddOutputMode(dst->dpy, dst->rr_output, id);
dst->mode.id = id;
} else {