diff options
author | Mikhail Lappo | 2017-06-14 18:11:05 -0500 |
---|---|---|
committer | android-build-merger | 2017-06-14 18:11:05 -0500 |
commit | df36644d6899c91ea481afe167f313996eafe789 (patch) | |
tree | c04a0aecfa0b9101006f030b8c57a21b5c06be10 | |
parent | 234e7683d3e7f4b07da892c918ddb1edec565c78 (diff) | |
parent | 34b7617cb77e9c63b335cb93bcfe644f178d4481 (diff) | |
download | platform-system-core-df36644d6899c91ea481afe167f313996eafe789.tar.gz platform-system-core-df36644d6899c91ea481afe167f313996eafe789.tar.xz platform-system-core-df36644d6899c91ea481afe167f313996eafe789.zip |
Merge "Va_end should be used with va_start" am: 5f4808382e
am: 34b7617cb7
Change-Id: Ibc9fed36270da3f960179086792ce1187be31e92
-rw-r--r-- | libpixelflinger/codeflinger/mips64_disassem.c | 1 | ||||
-rw-r--r-- | libpixelflinger/codeflinger/mips_disassem.c | 1 | ||||
-rw-r--r-- | libutils/Printer.cpp | 2 |
3 files changed, 4 insertions, 0 deletions
diff --git a/libpixelflinger/codeflinger/mips64_disassem.c b/libpixelflinger/codeflinger/mips64_disassem.c index f28d72627..1856e5c0e 100644 --- a/libpixelflinger/codeflinger/mips64_disassem.c +++ b/libpixelflinger/codeflinger/mips64_disassem.c | |||
@@ -555,6 +555,7 @@ static void db_printf(const char* fmt, ...) | |||
555 | } else { | 555 | } else { |
556 | vprintf(fmt, argp); | 556 | vprintf(fmt, argp); |
557 | } | 557 | } |
558 | va_end(argp); | ||
558 | } | 559 | } |
559 | 560 | ||
560 | /* | 561 | /* |
diff --git a/libpixelflinger/codeflinger/mips_disassem.c b/libpixelflinger/codeflinger/mips_disassem.c index 3007b1534..83a9740ed 100644 --- a/libpixelflinger/codeflinger/mips_disassem.c +++ b/libpixelflinger/codeflinger/mips_disassem.c | |||
@@ -562,6 +562,7 @@ static void db_printf(const char* fmt, ...) | |||
562 | } else { | 562 | } else { |
563 | vprintf(fmt, argp); | 563 | vprintf(fmt, argp); |
564 | } | 564 | } |
565 | va_end(argp); | ||
565 | } | 566 | } |
566 | 567 | ||
567 | 568 | ||
diff --git a/libutils/Printer.cpp b/libutils/Printer.cpp index 12f77bbc1..cbf042eb5 100644 --- a/libutils/Printer.cpp +++ b/libutils/Printer.cpp | |||
@@ -45,9 +45,11 @@ void Printer::printFormatLine(const char* format, ...) { | |||
45 | #ifndef _WIN32 | 45 | #ifndef _WIN32 |
46 | if (vasprintf(&formattedString, format, arglist) < 0) { // returns -1 on error | 46 | if (vasprintf(&formattedString, format, arglist) < 0) { // returns -1 on error |
47 | ALOGE("%s: Failed to format string", __FUNCTION__); | 47 | ALOGE("%s: Failed to format string", __FUNCTION__); |
48 | va_end(arglist); | ||
48 | return; | 49 | return; |
49 | } | 50 | } |
50 | #else | 51 | #else |
52 | va_end(arglist); | ||
51 | return; | 53 | return; |
52 | #endif | 54 | #endif |
53 | 55 | ||