Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2013-02-28 21:23:44 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2013-02-28 21:23:44 +0400
commit402f2159fa4cb76c602c0b9a9e3191b90c702c54 (patch)
tree59ac22780102c2f76fbfaa3e513f816144834420 /source/blender/blenkernel/intern/movieclip.c
parent28444a4831ae17f2cbe540a9bb721eb12161a289 (diff)
Fix own regression in commit from today -- missing NULL check
Crash happened when sequence image failed to load.
Diffstat (limited to 'source/blender/blenkernel/intern/movieclip.c')
-rw-r--r--source/blender/blenkernel/intern/movieclip.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/source/blender/blenkernel/intern/movieclip.c b/source/blender/blenkernel/intern/movieclip.c
index b748f8cbdd3..5519edca7ff 100644
--- a/source/blender/blenkernel/intern/movieclip.c
+++ b/source/blender/blenkernel/intern/movieclip.c
@@ -227,9 +227,11 @@ static ImBuf *movieclip_load_sequence_file(MovieClip *clip, MovieClipUser *user,
ibuf = IMB_loadiffname(name, loadflag, colorspace);
#ifdef WITH_OPENEXR
- if (ibuf->ftype == OPENEXR && ibuf->userdata) {
- IMB_exr_close(ibuf->userdata);
- ibuf->userdata = NULL;
+ if (ibuf) {
+ if (ibuf->ftype == OPENEXR && ibuf->userdata) {
+ IMB_exr_close(ibuf->userdata);
+ ibuf->userdata = NULL;
+ }
}
#endif