From 5b6481343f502c7b68b6f8ce2e0100ae74892336 Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Fri, 6 Nov 2015 12:57:36 +0000 Subject: [PATCH] Prevented use of uninitialized variable in case of memory shortage. Coverity CID 28809. --- xorriso/disk_ops.c | 24 ++++++++---------------- xorriso/xorriso_timestamp.h | 2 +- 2 files changed, 9 insertions(+), 17 deletions(-) diff --git a/xorriso/disk_ops.c b/xorriso/disk_ops.c index 3c8230fe..a829c96a 100644 --- a/xorriso/disk_ops.c +++ b/xorriso/disk_ops.c @@ -364,14 +364,10 @@ int Xorriso_show_dux_subs(struct XorrisO *xorriso, namept= name; *size= 0; - sfe= malloc(5*SfileadrL); - path= malloc(SfileadrL); - show_path= malloc(SfileadrL); - name= malloc(SfileadrL); - if(path==NULL || show_path==NULL || name==NULL || sfe==NULL) { - Xorriso_no_malloc_memory(xorriso, &sfe, 0); - {ret= -1; goto ex;} - } + Xorriso_alloc_meM(sfe, char, 5 * SfileadrL); + Xorriso_alloc_meM(path, char, SfileadrL); + Xorriso_alloc_meM(show_path, char, SfileadrL); + Xorriso_alloc_meM(name, char, SfileadrL); if(lstat(abs_path, &stbuf)==-1) {ret= 2; goto ex;} @@ -578,14 +574,10 @@ revoke_sorting:; ret= 1; ex:; - if(sfe!=NULL) - free(sfe); - if(path!=NULL) - free(path); - if(show_path!=NULL) - free(show_path); - if(name!=NULL) - free(name); + Xorriso_free_meM(sfe); + Xorriso_free_meM(path); + Xorriso_free_meM(show_path); + Xorriso_free_meM(name); Linkitem_reset_stack(&own_link_stack, link_stack, 0); Dirseq_destroy(&dirseq, 0); if(filev!=NULL) { diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h index bae57ba7..dcc6da0e 100644 --- a/xorriso/xorriso_timestamp.h +++ b/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2015.11.06.125101" +#define Xorriso_timestamP "2015.11.06.125705"