summaryrefslogtreecommitdiff
path: root/libs/utils/CallStack.cpp
diff options
context:
space:
mode:
author Marco Nelissen <marcone@google.com> 2012-12-17 10:28:20 -0800
committer Marco Nelissen <marcone@google.com> 2012-12-17 10:28:20 -0800
commit32130635f623924f1aa19dda3054bab371d682b3 (patch)
tree33e155705595fe536cb630b5e9a887e5c7880601 /libs/utils/CallStack.cpp
parent0e1e53e376ccb3c173ff8e5efeab39b2c5dfd6bd (diff)
Add NULL check to CallStack::toString
CallStack::toString() has a 0 default argument, which ends up getting passed to strlen(), resulting in a crash. Change-Id: If706aff8c400983670f49cdbb66e11191ac76e0e
Diffstat (limited to 'libs/utils/CallStack.cpp')
-rw-r--r--libs/utils/CallStack.cpp4
1 files changed, 3 insertions, 1 deletions
diff --git a/libs/utils/CallStack.cpp b/libs/utils/CallStack.cpp
index 18fd84f258..66fabebc4d 100644
--- a/libs/utils/CallStack.cpp
+++ b/libs/utils/CallStack.cpp
@@ -118,7 +118,9 @@ String8 CallStack::toString(const char* prefix) const {
char line[MAX_BACKTRACE_LINE_LENGTH];
format_backtrace_line(i, &mStack[i], &symbols[i],
line, MAX_BACKTRACE_LINE_LENGTH);
- str.append(prefix);
+ if (prefix) {
+ str.append(prefix);
+ }
str.append(line);
str.append("\n");
}