diff options
author | Peter Hutterer <peter@cs.unisa.edu.au> | 2008-05-02 11:00:14 +0930 |
---|---|---|
committer | Peter Hutterer <peter@cs.unisa.edu.au> | 2008-05-02 11:00:14 +0930 |
commit | 334456952930cb3e55c02fcdada2d0c074cd0520 (patch) | |
tree | dccc78d08cf18c68dfe38b498808f60da807c366 /hw/xfree86/dri/dri.c | |
parent | 8e56fd9728d63a7a48ef44503425c6e25c7c9ffb (diff) | |
parent | 3b8d53452cd6c74d32d7759964a7cd9ee775f161 (diff) |
Merge branch 'master' into mpx
Conflicts:
Xi/exevents.c
dix/devices.c
Diffstat (limited to 'hw/xfree86/dri/dri.c')
-rw-r--r-- | hw/xfree86/dri/dri.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/xfree86/dri/dri.c b/hw/xfree86/dri/dri.c index 263cc52cc..ae8818932 100644 --- a/hw/xfree86/dri/dri.c +++ b/hw/xfree86/dri/dri.c @@ -2437,7 +2437,7 @@ static void drmSIGIOHandler(int interrupt, void *closure) #if 0 fprintf(stderr, "Trying %d\n", entry->fd); #endif - if ((count = read(entry->fd, buf, sizeof(buf))) > 0) { + if ((count = read(entry->fd, buf, sizeof(buf) - 1)) > 0) { buf[count] = '\0'; #if 0 fprintf(stderr, "Got %s\n", buf); |