diff options
Diffstat (limited to 'hw/xfree86/loader/loadmod.c')
| -rw-r--r-- | hw/xfree86/loader/loadmod.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/hw/xfree86/loader/loadmod.c b/hw/xfree86/loader/loadmod.c index 871bfdac5..defe560ba 100644 --- a/hw/xfree86/loader/loadmod.c +++ b/hw/xfree86/loader/loadmod.c @@ -315,16 +315,14 @@ InitSubdirs(const char **subdirlist) if (**s == '/' || **s == '\\' || strchr(*s, ':') || strstr(*s, "..")) { xf86Msg(X_ERROR, "InitSubdirs: Bad subdir: \"%s\"\n", *s); - if (tmp_subdirlist) - free(tmp_subdirlist); + free(tmp_subdirlist); return NULL; } } } subdirs = malloc((i * 2 + 1) * sizeof(char *)); if (!subdirs) { - if (tmp_subdirlist) - free(tmp_subdirlist); + free(tmp_subdirlist); return NULL; } i = 0; @@ -348,8 +346,7 @@ InitSubdirs(const char **subdirlist) while (--i >= 0) free(subdirs[i]); free(subdirs); - if (tmp_subdirlist) - free(tmp_subdirlist); + free(tmp_subdirlist); return NULL; } /* tack on the OS name */ @@ -367,8 +364,7 @@ InitSubdirs(const char **subdirlist) } subdirs[i] = NULL; } - if (tmp_subdirlist) - free(tmp_subdirlist); + free(tmp_subdirlist); return (const char **)subdirs; } |