diff options
| author | marha <marha@users.sourceforge.net> | 2010-06-11 14:16:16 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-06-11 14:16:16 +0000 |
| commit | d1e4f4b8546c7955c66dd023bfd6ef437db9d21d (patch) | |
| tree | 529985e77bfc95aa95fe5b540e8f42b0ef041206 /xorg-server/glx/single2.c | |
| parent | 13919cf85a6ca41d97238de13344aba59e0f7680 (diff) | |
| parent | 4c61bf84b11e26e6f22648668c95ea760a379163 (diff) | |
| download | vcxsrv-d1e4f4b8546c7955c66dd023bfd6ef437db9d21d.tar.gz vcxsrv-d1e4f4b8546c7955c66dd023bfd6ef437db9d21d.tar.bz2 vcxsrv-d1e4f4b8546c7955c66dd023bfd6ef437db9d21d.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/glx/single2.c')
| -rw-r--r-- | xorg-server/glx/single2.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/xorg-server/glx/single2.c b/xorg-server/glx/single2.c index 4d8aeaa83..d0f0c83bb 100644 --- a/xorg-server/glx/single2.c +++ b/xorg-server/glx/single2.c @@ -276,10 +276,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';
|