xserver: Branch 'master'

[Alan Coopersmith]

 hw/xfree86/utils/xorgconfig/xorgconfig.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

New commits:
diff-tree f6aa2200f2fb4f4d4bb51e67d68e86aabcac0c4b (from e717eb82dc2e55f852919312d04f5cfc8ee55bc8)
Author: Roland "Test-tools" Bär <roland at verifysoft.de>
Date:   Mon Aug 6 12:37:52 2007 -0700

    Probable off by one buffer overflow in .../xorgconfig/xorgconfig.c
    
    X.Org Bug #11858 <http://bugs.freedesktop.org/show_bug.cgi?id=11858>
    Patch #11005 <http://bugs.freedesktop.org/attachment.cgi?id=11005>

diff --git a/hw/xfree86/utils/xorgconfig/xorgconfig.c b/hw/xfree86/utils/xorgconfig/xorgconfig.c
index 736b011..8d9c03f 100644
--- a/hw/xfree86/utils/xorgconfig/xorgconfig.c
+++ b/hw/xfree86/utils/xorgconfig/xorgconfig.c
@@ -2442,7 +2442,7 @@ write_fontpath_section(FILE *f)
 		len = nextdir - thisdir;
 		nextdir++;
 	    }
-	    if (len > sizeof(cur))
+	    if (len >= sizeof(cur))
 		continue;
 	    strncpy(cur, thisdir, len);
 	    cur[len] = '\0';