commit 35202f8b69705751d8e0098e7db5385fb09f26af
author Mark Salyzyn <salyzyn@google.com> Fri Feb 08 16:51:23 2019 -0800
committer android-build-merger <android-build-merger@google.com> Fri Feb 08 16:51:23 2019 -0800
tree 30a881f768f61c98f5b01bbce3c3e3b58e989d9e
parent da904dabd7624078ae71899267abad23d3fd9c15
parent a254bc34334a93c140e28146a4d6d38013fd3ac1

Merge "bootstat: crash when parsing ro.boot.boottime" am: c1fd33546e
am: 2d63629f5f

Change-Id: I534437d1910278f2bb5c3c04417c0e8817c2dba9

bootstat/bootstat.cpp

diff --git a/bootstat/bootstat.cpp b/bootstat/bootstat.cpp
index 6700b6c..8528752 100644
--- a/bootstat/bootstat.cpp
+++ b/bootstat/bootstat.cpp
@@ -1019,6 +1019,7 @@
     auto stageTimingValues = android::base::Split(stageTiming, ":");
     DCHECK_EQ(2U, stageTimingValues.size());
 
+    if (stageTimingValues.size() < 2) continue;
     std::string stageName = stageTimingValues[0];
     int32_t time_ms;
     if (android::base::ParseInt(stageTimingValues[1], &time_ms)) {