diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-09-14 10:15:46 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-09-14 10:15:46 +0400 |
| commit | 3957efdd38d0d5136f8d106de3a79e07b7b0b15f (patch) | |
| tree | 70b49c3ca3c1b4c9f0977575dbc083d22d068b82 /source/blender/avi | |
| parent | f6c7a69565153f65e49a0f6421ad04d23cdd946a (diff) | |
fix for out-of-bounds checks for fcurve modifier and poselib, also check for NULL members of avi structure (since they are checked for NULL later.)
Diffstat (limited to 'source/blender/avi')
| -rw-r--r-- | source/blender/avi/intern/avi.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/source/blender/avi/intern/avi.c b/source/blender/avi/intern/avi.c index 39424057faf..cda2cf303eb 100644 --- a/source/blender/avi/intern/avi.c +++ b/source/blender/avi/intern/avi.c @@ -734,9 +734,10 @@ AviError AVI_close(AviMovie *movie) fclose(movie->fp); - for (i = 0; i < movie->header->Streams; i++) { - if (movie->streams[i].sf != NULL) + for (i = 0; movie->header && (i < movie->header->Streams); i++) { + if (movie->streams && (movie->streams[i].sf != NULL)) { MEM_freeN(movie->streams[i].sf); + } } if (movie->header != NULL) @@ -1081,9 +1082,10 @@ AviError AVI_close_compress(AviMovie *movie) fclose(movie->fp); - for (i = 0; i < movie->header->Streams; i++) { - if (movie->streams[i].sf != NULL) + for (i = 0; movie->header && (i < movie->header->Streams); i++) { + if (movie->streams && (movie->streams[i].sf != NULL)) { MEM_freeN(movie->streams[i].sf); + } } if (movie->header != NULL) MEM_freeN(movie->header); |