diff --git a/ChangeLog b/ChangeLog index cb1058948..b948b34a2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-04-06 Adam Jackson + + * GL/glx/single2.c: + Coverity #985: Avoid segfault on malloc failure. + 2006-04-06 Adam Jackson * hw/dmx/dmxextension.c: diff --git a/GL/glx/single2.c b/GL/glx/single2.c index 383c8e763..efc7220f3 100644 --- a/GL/glx/single2.c +++ b/GL/glx/single2.c @@ -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) {