[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58598] trunk/blender/source/blender: add missing va_end() calls.

[Campbell Barton]

Revision: 58598
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58598
Author:   campbellbarton
Date:     2013-07-25 12:37:22 +0000 (Thu, 25 Jul 2013)
Log Message:
-----------
add missing va_end() calls.

Modified Paths:
--------------
    trunk/blender/source/blender/avi/intern/avi.c
    trunk/blender/source/blender/imbuf/intern/util.c

Modified: trunk/blender/source/blender/avi/intern/avi.c
===================================================================
--- trunk/blender/source/blender/avi/intern/avi.c	2013-07-25 12:07:55 UTC (rev 58597)
+++ trunk/blender/source/blender/avi/intern/avi.c	2013-07-25 12:37:22 UTC (rev 58598)
@@ -811,12 +811,16 @@
 		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 @@
 
 	PUT_FCCN((header_pos2 - header_pos1 + 4L), movie->fp);
 
+	va_end(ap);
+
 	return AVI_ERROR_NONE;
 }
 

Modified: trunk/blender/source/blender/imbuf/intern/util.c
===================================================================
--- trunk/blender/source/blender/imbuf/intern/util.c	2013-07-25 12:07:55 UTC (rev 58597)
+++ trunk/blender/source/blender/imbuf/intern/util.c	2013-07-25 12:37:22 UTC (rev 58598)
@@ -253,12 +253,12 @@
 {
 	if (ELEM(level, AV_LOG_FATAL, AV_LOG_ERROR)) {
 		size_t n;
-		va_list arg2;
+		va_list args_cpy;
 
-		va_copy(arg2, arg);
+		va_copy(args_cpy, arg);
+		n = BLI_vsnprintf(ffmpeg_last_error, sizeof(ffmpeg_last_error), format, args_cpy);
+		va_end(args_cpy);
 
-		n = BLI_vsnprintf(ffmpeg_last_error, sizeof(ffmpeg_last_error), format, arg2);
-
 		/* strip trailing \n */
 		ffmpeg_last_error[n - 1] = '\0';
 	}