diff --git a/xorriso/emulators.c b/xorriso/emulators.c index 6267f003..8824f9b0 100644 --- a/xorriso/emulators.c +++ b/xorriso/emulators.c @@ -1034,8 +1034,7 @@ int Xorriso_genisofs_hide_list(struct XorrisO *xorriso, char *whom, } ret= 1; ex:; - if(flag & 1) - Xorriso_read_lines(xorriso, fp, &linecount, &argc, &argv, 2); + Xorriso_read_lines(xorriso, fp, &linecount, &argc, &argv, 2); if(fp != NULL && fp != stdin) fclose(fp); if(ret<=0) diff --git a/xorriso/opts_p_z.c b/xorriso/opts_p_z.c index 3d909ece..8d2cbff4 100644 --- a/xorriso/opts_p_z.c +++ b/xorriso/opts_p_z.c @@ -218,8 +218,7 @@ ex:; xorriso->allow_graft_points= allow_graft_points_mem; Sfile_make_argv("", "", &argc, &argv, 2); Xorriso_free_meM(pathspec); - if(flag & 1) - Xorriso_read_lines(xorriso, fp, &linecount, &argc, &argv, 2); + Xorriso_read_lines(xorriso, fp, &linecount, &argc, &argv, 2); if(fp != NULL && fp != stdin) fclose(fp); diff --git a/xorriso/text_io.c b/xorriso/text_io.c index 229c9398..0d9306ba 100644 --- a/xorriso/text_io.c +++ b/xorriso/text_io.c @@ -725,8 +725,11 @@ int Xorriso_read_lines(struct XorrisO *xorriso, FILE *fp, int *linecount, if(*argv == NULL) {ret= -1; goto ex;} (*argv)[0]= strdup(line); - if((*argv)[0] == NULL) + if((*argv)[0] == NULL) { + free(*argv); + (*argv)= NULL; {ret= -1; goto ex;} + } *argc= 1; } ret= 1; diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h index c8886ea4..c5940761 100644 --- a/xorriso/xorriso_timestamp.h +++ b/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2019.08.13.161913" +#define Xorriso_timestamP "2019.08.14.094038"