commit f29e7a8daaa870b45db7a44d97b25a0b262afce0
author Narayan Kamath <narayan@google.com> Thu Jun 15 10:52:31 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jun 15 10:52:33 2017 +0000
tree 1a82ee6ec8fef25fd4f1b2c7c2100c0f7321dcf1
parent 5564e5e09af9a9640f94949c484804bba79b3a6d
parent e8fa1ab39646bed078f924beb1b96e9a53b1895c

Merge "zip_archive: validate data descriptor contents."

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 98cd2c6..84af293 100644
--- a/libutils/Printer.cpp
+++ b/libutils/Printer.cpp
@@ -47,9 +47,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
 

toolbox/upstream-netbsd/include/sys/mtio.h

diff --git a/toolbox/upstream-netbsd/include/sys/mtio.h b/toolbox/upstream-netbsd/include/sys/mtio.h
deleted file mode 100644
index 8fb5655..0000000
--- a/toolbox/upstream-netbsd/include/sys/mtio.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <linux/mtio.h>