Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(294)

Side by Side Diff: src/ports/SkDebug_android.cpp

Issue 394763004: Use va_list variable safely (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 1
2 /* 2 /*
3 * Copyright 2006 The Android Open Source Project 3 * Copyright 2006 The Android Open Source Project
4 * 4 *
5 * Use of this source code is governed by a BSD-style license that can be 5 * Use of this source code is governed by a BSD-style license that can be
6 * found in the LICENSE file. 6 * found in the LICENSE file.
7 */ 7 */
8 8
9 9
10 #include "SkTypes.h" 10 #include "SkTypes.h"
11 #include <stdio.h> 11 #include <stdio.h>
12 12
13 static const size_t kBufferSize = 256; 13 static const size_t kBufferSize = 256;
14 14
15 #define LOG_TAG "skia" 15 #define LOG_TAG "skia"
16 #include <android/log.h> 16 #include <android/log.h>
17 17
18 static bool gSkDebugToStdOut = false; 18 static bool gSkDebugToStdOut = false;
19 19
20 extern "C" void AndroidSkDebugToStdOut(bool debugToStdOut) { 20 extern "C" void AndroidSkDebugToStdOut(bool debugToStdOut) {
21 gSkDebugToStdOut = debugToStdOut; 21 gSkDebugToStdOut = debugToStdOut;
22 } 22 }
23 23
24 void SkDebugf(const char format[], ...) { 24 void SkDebugf(const char format[], ...) {
25 va_list args; 25 va_list args1, args2;
26 va_start(args, format); 26 va_start(args1, format);
27 __android_log_vprint(ANDROID_LOG_DEBUG, LOG_TAG, format, args); 27 va_copy(args2, args1);
28 __android_log_vprint(ANDROID_LOG_DEBUG, LOG_TAG, format, args1);
28 29
29 // Print debug output to stdout as well. This is useful for command 30 // Print debug output to stdout as well. This is useful for command
30 // line applications (e.g. skia_launcher) 31 // line applications (e.g. skia_launcher)
31 if (gSkDebugToStdOut) { 32 if (gSkDebugToStdOut) {
32 vprintf(format, args); 33 vprintf(format, args2);
33 } 34 }
34 35
35 va_end(args); 36 va_end(args1);
37 va_end(args2);
36 } 38 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698