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

Patch from Leon Merten Lohse: Correct the length of the CD-TEXT block.

Browse Source
This commit is contained in:
R. Bernstein
2011-12-04 20:29:53 -05:00
parent 6183d10207
commit 8d43aaca4d
8 changed files with 27 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/driver/image/bincue.c
View File

@@ -328,8 +328,8 @@ parse_cuefile (_img_private_t *cd, const char *psz_cue_name)
if(NULL != (psz_field = strtok (NULL, "\"\t\n\r"))) {
if (cd) {
uint8_t cdt_data[MAX_CDTEXT_DATA_LENGTH+4];
uint8_t *ptr;
int size;
int i;
CdioDataSource_t *source;
if(NULL == (source = cdio_stdio_new(psz_field))) {
@@ -338,21 +338,18 @@ parse_cuefile (_img_private_t *cd, const char *psz_cue_name)
}
size = cdio_stream_read(source, cdt_data, MAX_CDTEXT_DATA_LENGTH, 1);
if (size < 4) {
if (size < 5) {
cdio_log (log_level, "%s line %d: file `%s' is too small to contain CD-TEXT", psz_cue_name, i_line, psz_field);
goto err_exit;
}
/* prepend data length if not yet present */
if (cdt_data[0] >= 0x80) {
for(i=size-1; i >=0; i--)
cdt_data[i+4] = cdt_data[i];
cdt_data[0] = (size+2) << 8;
cdt_data[1] = (size+2) & 0xff;
cdt_data[2] = 0x00;
cdt_data[3] = 0x00;
/* cut header */
if (cdt_data[0] > 0x80) {
ptr = &cdt_data[4];
size -= 4;
}
else
ptr = cdt_data;
/* init cdtext */
if (NULL == cd->gen.cdtext) {
@@ -360,7 +357,7 @@ parse_cuefile (_img_private_t *cd, const char *psz_cue_name)
cdtext_init (cd->gen.cdtext);
}
if(!cdtext_data_init(cd->gen.cdtext, cdt_data))
if(!cdtext_data_init(cd->gen.cdtext, cdt_data, size))
cdio_log (log_level, "%s line %d: failed to parse CD-TEXT file `%s'", psz_cue_name, i_line, psz_field);
cdio_stdio_destroy (source);

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

@@ -750,7 +750,7 @@ parse_nrg (_img_private_t *p_env, const char *psz_nrg_name,
cdio_assert (len % sizeof (CDText_data_t) == 0);
p_env->gen.cdtext = malloc(sizeof(cdtext_t));
cdtext_init (p_env->gen.cdtext);
if(!cdtext_data_init (p_env->gen.cdtext, &wdata[-4]))
if(!cdtext_data_init (p_env->gen.cdtext, wdata, len))
{
cdtext_destroy(p_env->gen.cdtext);
free(p_env->gen.cdtext);