Re: [PATCH] xfsdump: Fix memory leak in invutil/stobj.c

[Brian Foster <bfoster@redhat.com>]

On Wed, Mar 05, 2014 at 09:11:51PM +0100, Boris Ranto wrote:
> The function open_stobj duplicates its argument, upon successful
> duplication, the fstat is called. If the fstat command fails then
> the memory for the duplicated string is leaked. Fix this by moving
> the string duplication after the fstat call. This is ok because
> the fstat call does not use the duplicated string.
> 
> Signed-off-by: Boris Ranto <ranto.boris@gmail.com>
> ---

The fix looks fine to me, but in the same scenario it looks like we also
leak the fd. Care to clean that up in this patch as well? :)

Brian

>  invutil/stobj.c |   12 ++++++------
>  1 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/invutil/stobj.c b/invutil/stobj.c
> index 428b419..55abe63 100644
> --- a/invutil/stobj.c
> +++ b/invutil/stobj.c
> @@ -578,12 +578,6 @@ open_stobj(char *StObjFileName)
>  	return fd;
>      }
>  
> -    name = strdup(StObjFileName);
> -    if(name == NULL) {
> -	fprintf(stderr, "%s: internal memory error: strdup stobj_name\n", g_programName);
> -	exit(1);
> -    }
> -
>      read_n_bytes(fd, &cnt, sizeof(invt_sescounter_t), StObjFileName);
>      lseek( fd, 0, SEEK_SET );
>      errno = 0;
> @@ -595,6 +589,12 @@ open_stobj(char *StObjFileName)
>      size = sb.st_size;
>      mapaddr = mmap_n_bytes(fd, size, BOOL_FALSE, StObjFileName);
>  
> +    name = strdup(StObjFileName);
> +    if(name == NULL) {
> +	fprintf(stderr, "%s: internal memory error: strdup stobj_name\n", g_programName);
> +	exit(1);
> +    }
> +
>      return add_stobj(name, fd, size, mapaddr, (invt_sescounter_t *)mapaddr);
>  }
>  
> -- 
> 1.7.1
> 
> _______________________________________________
> xfs mailing list
> xfs@oss.sgi.com
> http://oss.sgi.com/mailman/listinfo/xfs

_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs