commit 5ab44e73e5f9e2403e0cac0a448b35378dae1de8
author Treehugger Robot <treehugger-gerrit@google.com> Mon Dec 10 11:30:39 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Dec 10 11:30:39 2018 +0000
tree 51c3662e77caed93c16df30321723ee51e2a2d86
parent 95c591573686f75e32e9edd01777b8a42b186208
parent d57c51e9cffd3684401286a1c8797015ce52b77c

Merge "Fix scheduler_stats may resize to negative value"

runtime/thread.cc

diff --git a/runtime/thread.cc b/runtime/thread.cc
index 6c41ae4..8bec2d9 100644
--- a/runtime/thread.cc
+++ b/runtime/thread.cc
@@ -39,6 +39,7 @@
 #include <sstream>
 
 #include "android-base/stringprintf.h"
+#include "android-base/strings.h"
 
 #include "arch/context-inl.h"
 #include "arch/context.h"
@@ -1875,8 +1876,9 @@
 
   // Grab the scheduler stats for this thread.
   std::string scheduler_stats;
-  if (ReadFileToString(StringPrintf("/proc/self/task/%d/schedstat", tid), &scheduler_stats)) {
-    scheduler_stats.resize(scheduler_stats.size() - 1);  // Lose the trailing '\n'.
+  if (ReadFileToString(StringPrintf("/proc/self/task/%d/schedstat", tid), &scheduler_stats)
+      && !scheduler_stats.empty()) {
+    scheduler_stats = android::base::Trim(scheduler_stats);  // Lose the trailing '\n'.
   } else {
     scheduler_stats = "0 0 0";
   }