Re: [Man-db-devel] [PATCH v2] Fix several resource and memory leaks

[Colin Watson]

On Thu, Nov 01, 2018 at 01:26:19PM +0100, Nikola Forró wrote:
> Signed-off-by: Nikola Forró <address@hidden>

Thanks, this looks better.  One adjustment:

> diff --git a/src/mandb.c b/src/mandb.c
> index 78f6d1a6..fcef6d00 100644
> --- a/src/mandb.c
> +++ b/src/mandb.c
> @@ -558,7 +558,7 @@ static int process_manpath (const char *manpath, int 
> global_manpath,
>       struct tried_catdirs_entry *tried;
>       struct stat st;
>       int run_mandb = 0;
> -     struct dbpaths *dbpaths;
> +     struct dbpaths *dbpaths = NULL;
>       int amount = 0;
>  
>       if (global_manpath) {   /* system db */
> @@ -574,8 +574,10 @@ static int process_manpath (const char *manpath, int 
> global_manpath,
>       tried->seen = 0;
>       hashtable_install (tried_catdirs, catpath, strlen (catpath), tried);
>  
> -     if (stat (manpath, &st) < 0 || !S_ISDIR (st.st_mode))
> -             return 0;
> +     if (stat (manpath, &st) < 0 || !S_ISDIR (st.st_mode)) {
> +             amount = 0;
> +             goto out;
> +     }

Assigning amount here isn't necessary, since it's already initialised
above and can't be modified before this point.  I removed the
unnecessary assignment, added a detailed changelog, and pushed.

Thanks,

-- 
Colin Watson                                       address@hidden