diff options
| -rw-r--r-- | source/blender/avi/intern/avi.c | 10 | ||||
| -rw-r--r-- | source/blender/imbuf/intern/util.c | 8 |
2 files changed, 12 insertions, 6 deletions
diff --git a/source/blender/avi/intern/avi.c b/source/blender/avi/intern/avi.c index 48e64695822..6f819d438df 100644 --- a/source/blender/avi/intern/avi.c +++ b/source/blender/avi/intern/avi.c @@ -811,12 +811,16 @@ AviError AVI_open_compress(char *name, AviMovie *movie, int streams, ...) movie->streams[i].sh.fcc = FCC("strh"); movie->streams[i].sh.size = 56; movie->streams[i].sh.Type = avi_get_format_type(movie->streams[i].format); - if (movie->streams[i].sh.Type == 0) + if (movie->streams[i].sh.Type == 0) { + va_end(ap); return AVI_ERROR_FORMAT; + } movie->streams[i].sh.Handler = avi_get_format_fcc(movie->streams[i].format); - if (movie->streams[i].sh.Handler == 0) + if (movie->streams[i].sh.Handler == 0) { + va_end(ap); return AVI_ERROR_FORMAT; + } movie->streams[i].sh.Flags = 0; movie->streams[i].sh.Priority = 0; @@ -950,6 +954,8 @@ AviError AVI_open_compress(char *name, AviMovie *movie, int streams, ...) PUT_FCCN((header_pos2 - header_pos1 + 4L), movie->fp); + va_end(ap); + return AVI_ERROR_NONE; } diff --git a/source/blender/imbuf/intern/util.c b/source/blender/imbuf/intern/util.c index 4ec5879cfac..a4b0e61d544 100644 --- a/source/blender/imbuf/intern/util.c +++ b/source/blender/imbuf/intern/util.c @@ -253,11 +253,11 @@ static void ffmpeg_log_callback(void *ptr, int level, const char *format, va_lis { if (ELEM(level, AV_LOG_FATAL, AV_LOG_ERROR)) { size_t n; - va_list arg2; + va_list args_cpy; - va_copy(arg2, arg); - - n = BLI_vsnprintf(ffmpeg_last_error, sizeof(ffmpeg_last_error), format, arg2); + va_copy(args_cpy, arg); + n = BLI_vsnprintf(ffmpeg_last_error, sizeof(ffmpeg_last_error), format, args_cpy); + va_end(args_cpy); /* strip trailing \n */ ffmpeg_last_error[n - 1] = '\0'; |