blender
/
blender
136
406
Fork 587
Code Issues 6.2k Pull Requests 755 Projects 19 Wiki Activity

Fix crash accessing sequencer strips 

Was caused by recent clange sequences_all iterator in RNA (D11793).
This commit is contained in:
Sergey Sharybin 2021-07-07 14:21:23 +02:00
parent ecbf838fee
commit cffbfe5568
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source/blender/makesrna/intern/rna_sequencer.c
View File

@ -199,7 +199,10 @@ static void rna_SequenceEditor_sequences_all_begin(CollectionPropertyIterator *i
bli_iter->data = MEM_callocN(sizeof(SeqIterator), __func__);
iter->internal.custom = bli_iter;
SEQ_iterator_ensure(all_strips, bli_iter->data, (Sequence **)&bli_iter->current);
if (!SEQ_iterator_ensure(all_strips, bli_iter->data, (Sequence **)&bli_iter->current)) {
SEQ_collection_free(all_strips);
}
iter->valid = bli_iter->current != NULL;
}
@ -220,7 +223,9 @@ static void rna_SequenceEditor_sequences_all_end(CollectionPropertyIterator *ite
{
BLI_Iterator *bli_iter = iter->internal.custom;
SeqIterator *seq_iter = bli_iter->data;
SEQ_collection_free(seq_iter->collection);
if (seq_iter->collection != NULL) {
SEQ_collection_free(seq_iter->collection);
}
MEM_freeN(seq_iter);
MEM_freeN(bli_iter);
}