double-protect a naked assert

This commit is contained in:
Josh Coalson
2002-12-23 19:52:20 +00:00
parent 91d37b2418
commit c191ab4f78
2 changed files with 10 additions and 2 deletions

View File

@@ -500,8 +500,12 @@ int do_it()
grabbag__replaygain_get_album(&album_gain, &album_peak);
for(i = 0; i < option_values.num_files; i++) {
const char *error, *outfilename = get_encoded_outfilename(option_values.filenames[i]);
if(0 == strcmp(option_values.filenames[i], "-"))
if(0 == strcmp(option_values.filenames[i], "-")) {
FLAC__ASSERT(0);
/* double protection */
fprintf(stderr, "internal error\n");
return 2;
}
if(0 != (error = grabbag__replaygain_store_to_file_album(outfilename, album_gain, album_peak, /*preserve_modtime=*/true))) {
fprintf(stderr, "%s: ERROR writing ReplayGain album tags\n", outfilename);
retval = 1;

View File

@@ -421,8 +421,12 @@ FLAC__bool do_shorthand_operation__add_replay_gain(char **filenames, unsigned nu
}
FLAC__ASSERT(bits_per_sample >= FLAC__MIN_BITS_PER_SAMPLE && bits_per_sample <= FLAC__MAX_BITS_PER_SAMPLE);
if(!grabbag__replaygain_init(sample_rate))
if(!grabbag__replaygain_init(sample_rate)) {
FLAC__ASSERT(0);
/* double protection */
fprintf(stderr, "internal error\n");
return false;
}
if(
0 == (title_gains = (float*)malloc(sizeof(float) * num_files)) ||