Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix for crash in the sequencer if the video file fails to load (missing NULL check on imbuf),

Browse Source 
all other uses of sequencer_imbuf_assign_spaces() check for NULL or assume IMB_allocImBuf() succeeds.
This commit is contained in:
Campbell Barton
2012-10-08 02:20:47 +00:00
parent 99dd59f08c
commit 2fd2775350
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
source/blender/blenkernel/intern/sequencer.c
View File

@@ -1965,13 +1965,16 @@ static ImBuf *copy_from_ibuf_still(SeqRenderData context, Sequence *seq, float n
static void copy_to_ibuf_still(SeqRenderData context, Sequence *seq, float nr, ImBuf *ibuf) static void copy_to_ibuf_still(SeqRenderData context, Sequence *seq, float nr, ImBuf *ibuf)
{ {
/* warning: ibuf may be NULL if the video fails to load */
if (nr == 0 || nr == seq->len - 1) { if (nr == 0 || nr == seq->len - 1) {
/* we have to store a copy, since the passed ibuf /* we have to store a copy, since the passed ibuf
* could be preprocessed afterwards (thereby silently * could be preprocessed afterwards (thereby silently
* changing the cached image... */ * changing the cached image... */
ibuf = IMB_dupImBuf(ibuf); ibuf = IMB_dupImBuf(ibuf);
if (ibuf) {
sequencer_imbuf_assign_spaces(context.scene, ibuf); sequencer_imbuf_assign_spaces(context.scene, ibuf);
}
if (nr == 0) { if (nr == 0) {
BKE_sequencer_cache_put(context, seq, seq->start, SEQ_STRIPELEM_IBUF_STARTSTILL, ibuf); BKE_sequencer_cache_put(context, seq, seq->start, SEQ_STRIPELEM_IBUF_STARTSTILL, ibuf);