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

Merge branch 'greenleon' of git.sv.gnu.org:/srv/git/libcdio

Browse Source 
Conflicts:
	lib/driver/image/bincue.c
This commit is contained in:
R. Bernstein
2012-03-10 16:13:58 -05:00
parent 8023341b0b 0c7c1104fd
commit 892ff0522e
32 changed files with 1672 additions and 1210 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -750,10 +750,9 @@ parse_nrg (_img_private_t *p_env, const char *psz_nrg_name,
case CDTX_ID: { /* "CD TEXT" */
uint8_t *wdata = (uint8_t *) chunk->data;
int len = UINT32_FROM_BE (chunk->len);
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, len))
cdio_assert (len % CDTEXT_LEN_PACK == 0);
p_env->gen.cdtext = cdtext_init ();
if(0 !=cdtext_data_init (p_env->gen.cdtext, wdata, len))
{
cdtext_destroy(p_env->gen.cdtext);
free(p_env->gen.cdtext);