On Fri, Mar 07, 2014 at 03:52:42PM +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.
>
> Brian Foster noticed that the function also leaks a file descriptor
> in case the file cannot be fstated. Fixing that, too.
>
> Signed-off-by: Boris Ranto <ranto.boris@xxxxxxxxx>
> ---
> invutil/stobj.c | 13 +++++++------
> 1 file changed, 7 insertions(+), 6 deletions(-)
>
> diff --git a/invutil/stobj.c b/invutil/stobj.c
> index 428b419..a74ba0f 100644
> --- a/invutil/stobj.c
> +++ b/invutil/stobj.c
> @@ -578,23 +578,24 @@ 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;
> if (fstat(fd, &sb) < 0) {
> fprintf(stderr, "Could not get stat info on %s\n", StObjFileName);
> perror("fstat");
> + close(fd);
> return -1;
> }
> 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);
> }
>
The remaining failure cases all appear to exit(), including those in
add_stobj(). Looks good to me, thanks for making that fix...
Reviewed-by: Brian Foster <bfoster@xxxxxxxxxx>
> --
> 1.9.0
>
> _______________________________________________
> xfs mailing list
> xfs@xxxxxxxxxxx
> http://oss.sgi.com/mailman/listinfo/xfs
_______________________________________________
xfs mailing list
xfs@xxxxxxxxxxx
http://oss.sgi.com/mailman/listinfo/xfs
