diff options
Diffstat (limited to 'dix/dixfonts.c')
| -rw-r--r-- | dix/dixfonts.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/dix/dixfonts.c b/dix/dixfonts.c index 51c7ab64c..e32117748 100644 --- a/dix/dixfonts.c +++ b/dix/dixfonts.c @@ -677,7 +677,7 @@ doListFontsAndAliases(ClientPtr client, LFclosurePtr c) return TRUE; } if (err == FontNameAlias) { - if (resolved) free(resolved); + free(resolved); resolved = malloc(resolvedlen + 1); if (resolved) memmove(resolved, tmpname, resolvedlen + 1); @@ -731,8 +731,7 @@ doListFontsAndAliases(ClientPtr client, LFclosurePtr c) { c->saved = c->current; c->haveSaved = TRUE; - if (c->savedName) - free(c->savedName); + free(c->savedName); c->savedName = malloc(namelen + 1); if (c->savedName) memmove(c->savedName, name, namelen + 1); @@ -828,10 +827,10 @@ bail: for (i = 0; i < c->num_fpes; i++) FreeFPE(c->fpe_list[i]); free(c->fpe_list); - if (c->savedName) free(c->savedName); + free(c->savedName); FreeFontNames(names); free(c); - if (resolved) free(resolved); + free(resolved); return TRUE; } @@ -994,8 +993,7 @@ doListFontsWithInfo(ClientPtr client, LFWIclosurePtr c) c->saved = c->current; c->haveSaved = TRUE; c->savedNumFonts = numFonts; - if (c->savedName) - free(c->savedName); + free(c->savedName); c->savedName = malloc(namelen + 1); if (c->savedName) memmove(c->savedName, name, namelen + 1); @@ -1106,7 +1104,7 @@ bail: FreeFPE(c->fpe_list[i]); free(c->reply); free(c->fpe_list); - if (c->savedName) free(c->savedName); + free(c->savedName); free(c); return TRUE; } |