andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Coverity #985: Avoid segfault on malloc failure.

Browse Source
This commit is contained in:
Adam Jackson 2006-04-07 01:23:50 +00:00
parent 536628bb4b
commit bda292120f
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2006-04-06 Adam Jackson <ajax@freedesktop.org>
* GL/glx/single2.c:
Coverity #985: Avoid segfault on malloc failure.
2006-04-06 Adam Jackson <ajax@freedesktop.org>
* hw/dmx/dmxextension.c:

4
GL/glx/single2.c
View File

@ -270,12 +270,12 @@ char *__glXcombine_strings(const char *cext_string, const char *sext_string)
if (clen > slen) {
combo_string = (char *) xalloc(slen + 2);
s1 = (char *) xalloc(slen + 2);
strcpy(s1, sext_string);
if (s1) strcpy(s1, sext_string);
s2 = cext_string;
} else {
combo_string = (char *) xalloc(clen + 2);
s1 = (char *) xalloc(clen + 2);
strcpy(s1, cext_string);
if (s1) strcpy(s1, cext_string);
s2 = sext_string;
}
if (!combo_string || !s1) {