commit be5edcf6eb99b625ea5e10f5ea3ab46dbb5d0a01
author Mikhail Lappo <miklelappo@gmail.com> Wed Jun 14 23:16:35 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jun 14 23:16:35 2017 +0000
tree 20a52c304e65d6d6c1ffd17f25c786ea6745aba2
parent 29318dbed67d5d3501ecc00cb32051d8617e85d1
parent a4fe2b4787b600d74d5adc42983624bf8c441b14

Merge "Va_end should be used with va_start" am: 5f4808382e am: 34b7617cb7 am: df36644d68
am: 23d5ca1924

Change-Id: I39abe7e2e8bb3ecf5c49761caa9b64bc020f70d7

libpixelflinger/codeflinger/mips64_disassem.c

diff --git a/libpixelflinger/codeflinger/mips64_disassem.c b/libpixelflinger/codeflinger/mips64_disassem.c
index f28d726..1856e5c 100644
--- a/libpixelflinger/codeflinger/mips64_disassem.c
+++ b/libpixelflinger/codeflinger/mips64_disassem.c
@@ -555,6 +555,7 @@
     } else {
         vprintf(fmt, argp);
     }
+    va_end(argp);
 }
 
 /*

libpixelflinger/codeflinger/mips_disassem.c

diff --git a/libpixelflinger/codeflinger/mips_disassem.c b/libpixelflinger/codeflinger/mips_disassem.c
index 3007b15..83a9740 100644
--- a/libpixelflinger/codeflinger/mips_disassem.c
+++ b/libpixelflinger/codeflinger/mips_disassem.c
@@ -562,6 +562,7 @@
     } else {
         vprintf(fmt, argp);
     }
+    va_end(argp);
 }
 
 

libutils/Printer.cpp

diff --git a/libutils/Printer.cpp b/libutils/Printer.cpp
index 12f77bb..cbf042e 100644
--- a/libutils/Printer.cpp
+++ b/libutils/Printer.cpp
@@ -45,9 +45,11 @@
 #ifndef _WIN32
     if (vasprintf(&formattedString, format, arglist) < 0) { // returns -1 on error
         ALOGE("%s: Failed to format string", __FUNCTION__);
+        va_end(arglist);
         return;
     }
 #else
+    va_end(arglist);
     return;
 #endif