Mesa (mesa_7_7_branch): st/xorg: Ensure null-terminated byte string.

Vinson Lee vlee at kemper.freedesktop.org
Sun Jan 3 04:40:19 UTC 2010


Module: Mesa
Branch: mesa_7_7_branch
Commit: d2758f3b74838f4d4f1ae691fddca7dc9f4e8c0e
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d2758f3b74838f4d4f1ae691fddca7dc9f4e8c0e

Author: Vinson Lee <vlee at vmware.com>
Date:   Sat Jan  2 20:39:04 2010 -0800

st/xorg: Ensure null-terminated byte string.

---

 src/gallium/state_trackers/xorg/xorg_crtc.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/gallium/state_trackers/xorg/xorg_crtc.c b/src/gallium/state_trackers/xorg/xorg_crtc.c
index 68ddeae..0160b1a 100644
--- a/src/gallium/state_trackers/xorg/xorg_crtc.c
+++ b/src/gallium/state_trackers/xorg/xorg_crtc.c
@@ -122,7 +122,8 @@ crtc_set_mode_major(xf86CrtcPtr crtc, DisplayModePtr mode,
     drm_mode.vrefresh = mode->VRefresh;
     if (!mode->name)
 	xf86SetModeDefaultName(mode);
-    strncpy(drm_mode.name, mode->name, DRM_DISPLAY_MODE_LEN);
+    strncpy(drm_mode.name, mode->name, DRM_DISPLAY_MODE_LEN - 1);
+    drm_mode.name[DRM_DISPLAY_MODE_LEN - 1] = '\0';
 
     ret = drmModeSetCrtc(ms->fd, drm_crtc->crtc_id, ms->fb_id, x, y,
 			 &drm_connector->connector_id, 1, &drm_mode);




More information about the mesa-commit mailing list