claunia/libcdio-osx
Archived
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

patch from Honza Horak using Coverity's static analysis tool.

Browse Source
This commit is contained in:
rocky
2011-05-30 15:19:22 -04:00
parent 9be0980337
commit 940b7cd848
20 changed files with 52 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
example/audio.c
View File

@@ -335,6 +335,7 @@ main(int argc, char *argv[])
i_volume_level = atoi(optarg);
todo = SET_VOLUME;
}
break;
case 't':
if (NULL != (h = strchr(optarg,'-'))) {
*h = 0;

4
example/mmc2a.c
View File

@@ -40,7 +40,7 @@
static void
print_mode_sense (const char *psz_drive, const char *six_or_ten,
const uint8_t buf[22])
const uint8_t buf[30])
{
printf("Mode sense %s information for %s:\n", six_or_ten, psz_drive);
if (buf[2] & 0x01) {
@@ -210,7 +210,7 @@ main(int argc, const char *argv[])
printf("Couldn't find CD\n");
return 77;
} else {
uint8_t buf[22] = { 0, }; /* Place to hold returned data */
uint8_t buf[30] = { 0, }; /* Place to hold returned data */
char *psz_cd = cdio_get_default_device(p_cdio);
if (DRIVER_OP_SUCCESS == mmc_mode_sense_6(p_cdio, buf, sizeof(buf),
CDIO_MMC_CAPABILITIES_PAGE) ) {

4
example/paranoia.c
View File

@@ -131,6 +131,10 @@ main(int argc, const char *argv[])
track_t i_track = cdda_sector_gettrack(d, i_first_lsn);
lsn_t i_last_lsn = cdda_track_lastsector(d, i_track);
int fd = creat("track1s.wav", 0644);
if (-1 == fd) {
printf("Unable to create track1s.wav\n");
exit(1);
}
/* For demo purposes we'll read only 300 frames (about 4
seconds). We don't want this to take too long. On the other

1
lib/cdda_interface/cddap_interface.c
View File

@@ -281,6 +281,7 @@ verify_read_command(cdrom_drive_t *d)
if(!audioflag){
cdmessage(d,"\tCould not find any audio tracks on this disk.\n");
free(buff);
return(-403);
}

4
lib/cdda_interface/common_interface.c
View File

@@ -58,8 +58,8 @@ data_bigendianp(cdrom_drive_t *d)
float *a=calloc(1024,sizeof(float));
float *b=calloc(1024,sizeof(float));
long readsectors=5;
int16_t *buff=malloc(readsectors*CDIO_CD_FRAMESIZE_RAW);
memset(buff, 0, readsectors*CDIO_CD_FRAMESIZE_RAW);
int16_t *buff=malloc(readsectors*CDIO_CD_FRAMESIZE_RAW*sizeof(int16_t));
memset(buff, 0, readsectors*CDIO_CD_FRAMESIZE_RAW*sizeof(int16_t));
/* look at the starts of the audio tracks */
/* if real silence, tool in until some static is found */

4
lib/cdda_interface/scan_devices.c
View File

@@ -325,7 +325,6 @@ cdda_identify_device_cdio(CdIo_t *p_cdio, const char *psz_device,
snprintf( d->drive_model, i_len, "%s %s %s %s",
hw_info.psz_vendor, hw_info.psz_model, hw_info.psz_revision,
description );
free(description);
} else {
d->drive_model=malloc( i_len );
snprintf( d->drive_model, i_len, "%s %s %s",
@@ -337,5 +336,8 @@ cdda_identify_device_cdio(CdIo_t *p_cdio, const char *psz_device,
}
}
if (description)
free(description);
return(d);
}

2
lib/driver/device.c
View File

@@ -1048,7 +1048,7 @@ driver_return_code_t
cdio_set_blocksize ( const CdIo_t *p_cdio, int i_blocksize )
{
if (!p_cdio) return DRIVER_OP_UNINIT;
if (p_cdio->op.set_blocksize) return DRIVER_OP_UNSUPPORTED;
if (!p_cdio->op.set_blocksize) return DRIVER_OP_UNSUPPORTED;
return p_cdio->op.set_blocksize(p_cdio->env, i_blocksize);
}

12
lib/driver/gnu_linux.c
View File

@@ -198,11 +198,13 @@ check_mounts_linux(const char *mtab)
}
}
}
if ( strcmp(mnt_type, "iso9660") == 0 ) {
if (is_cdrom_linux(mnt_dev, mnt_type) > 0) {
free(mnt_type);
endmntent(mntfp);
return mnt_dev;
if ( mnt_type && mnt_dev ) {
if ( strcmp(mnt_type, "iso9660") == 0 ) {
if (is_cdrom_linux(mnt_dev, mnt_type) > 0) {
free(mnt_type);
endmntent(mntfp);
return mnt_dev;
}
}
}
free(mnt_dev);

8
lib/driver/image/cdrdao.c
View File

@@ -621,18 +621,18 @@ parse_tocfile (_img_private_t *cd, const char *psz_cue_name)
goto format_error;
}
} else if (0 == strcmp ("COPY", psz_keyword)) {
if (NULL != cd)
if (NULL != cd && i >= 0)
cd->tocent[i].flags |= CDIO_TRACK_FLAG_COPY_PERMITTED;
} else if (0 == strcmp ("PRE_EMPHASIS", psz_keyword)) {
if (NULL != cd)
if (NULL != cd && i >= 0)
cd->tocent[i].flags |= CDIO_TRACK_FLAG_PRE_EMPHASIS;
/* TWO_CHANNEL_AUDIO */
} else if (0 == strcmp ("TWO_CHANNEL_AUDIO", psz_keyword)) {
if (NULL != cd)
if (NULL != cd && i >= 0)
cd->tocent[i].flags &= ~CDIO_TRACK_FLAG_FOUR_CHANNEL_AUDIO;
/* FOUR_CHANNEL_AUDIO */
} else if (0 == strcmp ("FOUR_CHANNEL_AUDIO", psz_keyword)) {
if (NULL != cd)
if (NULL != cd && i >= 0)
cd->tocent[i].flags |= CDIO_TRACK_FLAG_FOUR_CHANNEL_AUDIO;
/* ISRC "CCOOOYYSSSSS" */

1
lib/driver/image/nrg.c
View File

@@ -182,6 +182,7 @@ parse_nrg (_img_private_t *p_env, const char *psz_nrg_name,
long unsigned int footer_start;
long unsigned int size;
char *footer_buf = NULL;
if (!p_env) return false;
size = cdio_stream_stat (p_env->gen.data_source);
if (-1 == size) return false;

1
lib/driver/mmc/mmc.c
View File

@@ -413,6 +413,7 @@ mmc_set_blocksize_private ( void *p_env,
memset (&mh, 0, sizeof (mh));
mh.block_desc_length = 0x08;
/* while i_blocksize is uint16_t, this expression is always 0 */
mh.block_length_hi = (i_blocksize >> 16) & 0xff;
mh.block_length_med = (i_blocksize >> 8) & 0xff;
mh.block_length_lo = (i_blocksize >> 0) & 0xff;

2
lib/driver/read.c
View File

@@ -176,7 +176,7 @@ cdio_read_mode1_sector (const CdIo_t *p_cdio, void *p_buf, lsn_t i_lsn,
if (p_cdio->op.read_mode1_sector) {
return p_cdio->op.read_mode1_sector(p_cdio->env, p_buf, i_lsn, b_form2);
} else if (p_cdio->op.lseek && p_cdio->op.read) {
char buf[CDIO_CD_FRAMESIZE] = { 0, };
char buf[M2RAW_SECTOR_SIZE] = { 0, };
if (0 > cdio_lseek(p_cdio, CDIO_CD_FRAMESIZE*i_lsn, SEEK_SET))
return -1;
if (0 > cdio_read(p_cdio, buf, CDIO_CD_FRAMESIZE))

9
lib/iso9660/iso9660_fs.c
View File

@@ -192,11 +192,8 @@ iso9660_open_ext_private (const char *psz_path,
return p_iso;
error:
if (p_iso && p_iso->stream) {
cdio_stdio_destroy(p_iso->stream);
if (p_iso) free(p_iso);
}
if (p_iso && p_iso->stream) cdio_stdio_destroy(p_iso->stream);
free(p_iso);
return NULL;
}
@@ -1031,6 +1028,7 @@ _fs_stat_traverse (const CdIo_t *p_cdio, const iso9660_stat_t *_root,
if (!trans_fname) {
cdio_warn("can't allocate %lu bytes",
(long unsigned int) strlen(p_stat->filename));
free(p_stat);
return NULL;
}
trans_len = iso9660_name_translate_ext(p_stat->filename, trans_fname,
@@ -1137,6 +1135,7 @@ _fs_iso_stat_traverse (iso9660_t *p_iso, const iso9660_stat_t *_root,
if (!trans_fname) {
cdio_warn("can't allocate %lu bytes",
(long unsigned int) strlen(p_stat->filename));
free(p_stat);
return NULL;
}
trans_len = iso9660_name_translate_ext(p_stat->filename, trans_fname,

6
lib/paranoia/paranoia.c
View File

@@ -1357,14 +1357,14 @@ i_stage2_each(root_block *root, v_fragment_t *v,
void(*callback)(long int, paranoia_cb_mode_t))
{
/* If this fragment has already been merged & freed, abort. */
if (!v || !v->one) return(0);
cdrom_paranoia_t *p=v->p;
/* ??? Why do we round down to an even dynoverlap? */
long dynoverlap=p->dynoverlap/2*2;
/* If this fragment has already been merged & freed, abort. */
if (!v || !v->one) return(0);
/* If there's no verified root yet, abort. */
if (!rv(root)){
return(0);

3
lib/udf/udf_file.c
View File

@@ -192,9 +192,10 @@ offset_to_lba(const udf_dirent_t *p_udf_dirent, off_t i_offset,
*/
*pi_max_size = 0;
printf("Don't know how to data in ICB handle yet\n");
return CDIO_INVALID_LBA;
case ICBTAG_FLAG_AD_EXTENDED:
printf("Don't know how to handle extended addresses yet\n");
return CDIO_INVALID_LBA;
default:
printf("Unsupported allocation descriptor %d\n", addr_ilk);
return CDIO_INVALID_LBA;

5
lib/udf/udf_fs.c
View File

@@ -658,8 +658,9 @@ udf_readdir(udf_dirent_t *p_udf_dirent)
uint8_t data[UDF_BLOCKSIZE] = {0};
udf_file_entry_t *p_udf_fe = (udf_file_entry_t *) &data;
udf_read_sectors(p_udf, p_udf_fe, p_udf->i_part_start
+ p_udf_dirent->fid->icb.loc.lba, 1);
if (DRIVER_OP_SUCCESS != udf_read_sectors(p_udf, p_udf_fe, p_udf->i_part_start
+ p_udf_dirent->fid->icb.loc.lba, 1))
return NULL;
memcpy(&(p_udf_dirent->fe), p_udf_fe,
sizeof(udf_file_entry_t) + p_udf_fe->i_alloc_descs

1
src/cd-info.c
View File

@@ -528,6 +528,7 @@ print_iso9660_recurse (CdIo_t *p_cdio, const char pathname[],
if (NULL == p_entlist) {
report( stderr, "Error getting above directory information\n" );
free(translated_name);
free(p_dirlist);
return;
}

7
src/cd-paranoia/cd-paranoia.c
View File

@@ -342,7 +342,7 @@ callback(long int inpos, paranoia_cb_mode_t function)
if (callscript)
fprintf(stderr, "##: %d [%s] @ %ld\n",
function, ((int) function >= -2 && (int) function <= 13 ?
function, ((int) function >= -2 && (int) function < 13 ?
callback_strings[function+2] : ""),
inpos);
@@ -1138,6 +1138,11 @@ main(int argc,char *argv[])
if (optind+1<argc) {
if (!strcmp(argv[optind+1],"-") ){
out = dup(fileno(stdout));
if(out==-1){
report2("Cannot dupplicate stdout: %s",
strerror(errno));
exit(1);
}
if(batch)
report("Are you sure you wanted 'batch' "
"(-B) output with stdout?");

3
src/cd-read.c
View File

@@ -545,10 +545,13 @@ main(int argc, char *argv[])
break;
case READ_M1F2:
blocklen=M2RAW_SECTOR_SIZE;
break;
case READ_M2F1:
blocklen=CDIO_CD_FRAMESIZE;
break;
case READ_M2F2:
blocklen=M2F2_SECTOR_SIZE;
break;
default: ;
}
}

2
src/iso-info.c
View File

@@ -209,6 +209,8 @@ print_iso9660_recurse (iso9660_t *p_iso, const char psz_path[])
}
if (NULL == entlist) {
free(translated_name);
free(dirlist);
report( stderr, "Error getting above directory information\n" );
free(translated_name);
return;