Cool_Tools/vgmstream
1
0
Fork 0
mirror of https://github.com/vgmstream/vgmstream.git synced 2024-11-28 16:30:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix TXTP segfault when not using groups

Browse Source
This commit is contained in:
bnnm 2020-12-01 23:50:01 +01:00
parent 78bb21b3ed
commit b87c06447c
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/meta/txtp.c
View File

@ -184,7 +184,6 @@ VGMSTREAM* init_vgmstream_txtp(STREAMFILE* sf) {
clean_txtp(txtp, 0); clean_txtp(txtp, 0);
return vgmstream; return vgmstream;
fail: fail:
clean_txtp(txtp, 1); clean_txtp(txtp, 1);
return NULL; return NULL;
@ -444,7 +443,7 @@ static int make_group_segment(txtp_header* txtp, txtp_group* grp, int position,
/* special "whole loop" settings */ /* special "whole loop" settings */
if (grp->entry.loop_anchor_start == 1) { if (grp && grp->entry.loop_anchor_start == 1) {
grp->entry.config.config_set = 1; grp->entry.config.config_set = 1;
grp->entry.config.really_force_loop = 1; grp->entry.config.really_force_loop = 1;
} }
@ -506,8 +505,8 @@ static int make_group_layer(txtp_header* txtp, txtp_group* grp, int position, in
/* special "whole loop" settings (also loop if this group becomes final vgmstream) */ /* special "whole loop" settings (also loop if this group becomes final vgmstream) */
if (grp->entry.loop_anchor_start == 1 if (grp && (grp->entry.loop_anchor_start == 1
|| (position == 0 && txtp->vgmstream_count == count && txtp->is_loop_auto)) { || (position == 0 && txtp->vgmstream_count == count && txtp->is_loop_auto))) {
grp->entry.config.config_set = 1; grp->entry.config.config_set = 1;
grp->entry.config.really_force_loop = 1; grp->entry.config.really_force_loop = 1;
} }
@ -568,7 +567,7 @@ static int make_group_random(txtp_header* txtp, txtp_group* grp, int position, i
/* special "whole loop" settings */ /* special "whole loop" settings */
if (grp->entry.loop_anchor_start == 1) { if (grp && grp->entry.loop_anchor_start == 1) {
grp->entry.config.config_set = 1; grp->entry.config.config_set = 1;
grp->entry.config.really_force_loop = 1; grp->entry.config.really_force_loop = 1;
} }
@ -576,7 +575,8 @@ static int make_group_random(txtp_header* txtp, txtp_group* grp, int position, i
/* force selected vgmstream to be a segment when not a group already, and /* force selected vgmstream to be a segment when not a group already, and
* group + vgmstream has config (AKA must loop/modify over the result) */ * group + vgmstream has config (AKA must loop/modify over the result) */
//todo could optimize to not generate segment in some cases? //todo could optimize to not generate segment in some cases?
if (!(vgmstream->layout_type == layout_layered || vgmstream->layout_type == layout_segmented) && if (grp &&
!(vgmstream->layout_type == layout_layered || vgmstream->layout_type == layout_segmented) &&
(grp->entry.config.config_set && vgmstream->config.config_set) ) { (grp->entry.config.config_set && vgmstream->config.config_set) ) {
if (!make_group_segment(txtp, grp, position, 1)) if (!make_group_segment(txtp, grp, position, 1))
goto fail; goto fail;