aboutsummaryrefslogtreecommitdiff
path: root/libX11/src/XlibInt.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-02-03 09:44:39 +0000
committermarha <marha@users.sourceforge.net>2011-02-03 09:44:39 +0000
commit83a4fe0dc71aafbef11477b284abe530d3877556 (patch)
tree527158f28d9a46d1e9cc83b6c5fa6e8fbed956eb /libX11/src/XlibInt.c
parent60107fb2d201703dba061622101dafc139559bca (diff)
downloadvcxsrv-83a4fe0dc71aafbef11477b284abe530d3877556.tar.gz
vcxsrv-83a4fe0dc71aafbef11477b284abe530d3877556.tar.bz2
vcxsrv-83a4fe0dc71aafbef11477b284abe530d3877556.zip
libXext xserver libXau libX11 pixman mesa git update 3 Feb 2011
Diffstat (limited to 'libX11/src/XlibInt.c')
-rw-r--r--libX11/src/XlibInt.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/libX11/src/XlibInt.c b/libX11/src/XlibInt.c
index c385f4cbf..a78da9bf1 100644
--- a/libX11/src/XlibInt.c
+++ b/libX11/src/XlibInt.c
@@ -662,6 +662,7 @@ XAddConnectionWatch(
UnlockDisplay(dpy);
return 0;
}
+ info_list->watch_data = wd_array;
wd_array[dpy->watcher_count] = NULL; /* for cleanliness */
}
@@ -1438,9 +1439,10 @@ static int _XPrintDefaultError(
ext && (ext->codes.major_opcode != event->request_code);
ext = ext->next)
;
- if (ext)
- strcpy(buffer, ext->name);
- else
+ if (ext) {
+ strncpy(buffer, ext->name, BUFSIZ);
+ buffer[BUFSIZ - 1] = '\0';
+ } else
buffer[0] = '\0';
}
(void) fprintf(fp, " (%s)\n", buffer);