On Thu, Mar 31, 2011 at 04:26:06PM +0300, Tiago Vignatti wrote: > Signed-off-by: Tiago Vignatti <[email protected]> > Reviewed-by: Peter Hutterer <[email protected]> > Reviewed-by: Nicolas Peninguy <[email protected]> > --- > This one is with FreePathList addition that Nicolas suggested. Also, based on > Peter's review I generated the next patch, grouping the return code in one > single exit. > > hw/xfree86/loader/loadmod.c | 6 ++++++ > 1 files changed, 6 insertions(+), 0 deletions(-) > > diff --git a/hw/xfree86/loader/loadmod.c b/hw/xfree86/loader/loadmod.c > index eaa99e8..46ce68b 100644 > --- a/hw/xfree86/loader/loadmod.c > +++ b/hw/xfree86/loader/loadmod.c > @@ -532,6 +532,7 @@ LoaderListDirs(const char **subdirlist, const char > **patternlist) > FreePathList(pathlist); > FreeSubdirs(subdirs); > FreePatterns(patterns); > + closedir(d); > return NULL; > } > listing[n] = malloc(len + 1); > @@ -540,6 +541,7 @@ LoaderListDirs(const char **subdirlist, const char > **patternlist) > FreePathList(pathlist); > FreeSubdirs(subdirs); > FreePatterns(patterns); > + closedir(d); > return NULL; > } > strncpy(listing[n], dp->d_name + match[1].rm_so, > @@ -556,6 +558,10 @@ LoaderListDirs(const char **subdirlist, const char > **patternlist) > } > if (listing) > listing[n] = NULL; > + > + FreePathList(pathlist); > + FreeSubdirs(subdirs); > + FreePatterns(patterns); > return listing; > } > > -- > 1.7.0.4
merged this one into my branch, pull will go out later today. Cheers, Peter _______________________________________________ [email protected]: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel
