From 4c61bf84b11e26e6f22648668c95ea760a379163 Mon Sep 17 00:00:00 2001 From: marha Date: Fri, 11 Jun 2010 12:14:52 +0000 Subject: xserver git update 11/6/2010 --- xorg-server/glx/single2.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'xorg-server/glx/single2.c') diff --git a/xorg-server/glx/single2.c b/xorg-server/glx/single2.c index 754cc0b86..ee6e64f07 100644 --- a/xorg-server/glx/single2.c +++ b/xorg-server/glx/single2.c @@ -272,10 +272,8 @@ char *__glXcombine_strings(const char *cext_string, const char *sext_string) s2 = sext_string; } if (!combo_string || !s1) { - if (combo_string) - free(combo_string); - if (s1) - free(s1); + free(combo_string); + free(s1); return NULL; } combo_string[0] = '\0'; -- cgit v1.2.3