Browse Source

Bug fix: SIGSEGV with option -status and no search string

tags/ZeroFourZero
Thomas Schmitt 11 years ago
parent
commit
1a3297b658
2 changed files with 10 additions and 7 deletions
  1. +1
    -1
      xorriso/xorriso_timestamp.h
  2. +9
    -6
      xorriso/xorrisoburn.c

+ 1
- 1
xorriso/xorriso_timestamp.h View File

@@ -1 +1 @@
#define Xorriso_timestamP "2009.04.25.162858"
#define Xorriso_timestamP "2009.05.06.173600"

+ 9
- 6
xorriso/xorrisoburn.c View File

@@ -113,7 +113,7 @@ int Xorriso_path_from_node(struct XorrisO *xorriso, IsoNode *node, int lba,
#define Xorriso_cd_min_track_sizE 300


/* Default setting for -relax_compliance */
/* Default setting for -compliance */
#define Xorriso_relax_compliance_defaulT \
(isoburn_igopt_allow_deep_paths | isoburn_igopt_allow_longer_paths | \
isoburn_igopt_always_gmt | \
@@ -8846,11 +8846,11 @@ int Xorriso_relax_compliance(struct XorrisO *xorriso, char *mode,

} else {
if(l<SfileadrL)
sprintf(xorriso->info_text, "-relax_compliance: unknown rule '%s'",
sprintf(xorriso->info_text, "-compliance: unknown rule '%s'",
cpt);
else
sprintf(xorriso->info_text,
"-relax_compliance: oversized rule parameter (%d)", l);
"-compliance: oversized rule parameter (%d)", l);
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
xorriso->relax_compliance= was;
return(0);
@@ -10545,9 +10545,12 @@ int Xorriso_status_zisofs(struct XorrisO *xorriso, char *filter, FILE *fp,
xorriso->zisofs_block_size == xorriso->zisofs_block_size_default &&
xorriso->zisofs_by_magic == 0 &&
ziso_count == 0 && osiz_count == 0 &&
gzip_count == 0 && gunzip_count == 0 &&
filter[0] == 0)
return 2;
gzip_count == 0 && gunzip_count == 0) {
if(filter == NULL)
return(2);
if(filter[0] == 0)
return 2;
}
sprintf(xorriso->result_line,
"-zisofs level=%d:block_size=%dk:by_magic=%s:ziso_used=%.f:osiz_used=%.f",
xorriso->zlib_level, xorriso->zisofs_block_size / 1024,


Loading…
Cancel
Save