commit 778b15a20bb42eeed612f5540181d43c7ba7b2ac
author Brian Lindahl <blindahl@google.com> Sat May 13 07:42:13 2023 -0600
committer Brian Lindahl <blindahl@google.com> Sun May 14 15:38:13 2023 -0600
tree 8387f0f6fe70e4a901bd1e4e1db5398b34d62cdd
parent 13e40cb2b1ad6f8101a0eee87c54139fbf677bca

Fix bug with parsing vectors

Also move to StringUtils, add unit test and use std::from_chars.

Bug: 234833109
Test: statsd_testdrive 684 while watching YouTube videos
Test: atest mediametrics_tests#parseVector
Change-Id: I0eff0bcb7fb9542fdab0c08b98f7789decedb7d2

services/mediametrics/statsd_codec.cpp

diff --git a/services/mediametrics/statsd_codec.cpp b/services/mediametrics/statsd_codec.cpp
index a0b8f16..ad4cfce 100644
--- a/services/mediametrics/statsd_codec.cpp
+++ b/services/mediametrics/statsd_codec.cpp
@@ -23,6 +23,7 @@
 #include <pthread.h>
 #include <pwd.h>
 #include <stdint.h>
+#include <string>
 #include <string.h>
 #include <sys/stat.h>
 #include <sys/time.h>
@@ -32,11 +33,12 @@
 #include <stats_media_metrics.h>
 #include <stats_event.h>
 
-#include "cleaner.h"
-#include "MediaMetricsService.h"
-#include "ValidateId.h"
-#include "frameworks/proto_logging/stats/message/mediametrics_message.pb.h"
-#include "iface_statsd.h"
+#include <frameworks/proto_logging/stats/message/mediametrics_message.pb.h>
+#include <mediametricsservice/cleaner.h>
+#include <mediametricsservice/iface_statsd.h>
+#include <mediametricsservice/MediaMetricsService.h>
+#include <mediametricsservice/StringUtils.h>
+#include <mediametricsservice/ValidateId.h>
 
 namespace android {
 
@@ -169,27 +171,8 @@
 }
 
 static void parseVector(const std::string &str, std::vector<int32_t> *vector) {
-    char valueStr[12] = {};
-    int i = 0;
-    for (char const * p = str.c_str(); *p != 0; ++p) {
-        if (*p == ',' || *p == '{' || *p == '}') {
-            valueStr[i] = 0;
-            int64_t value = strtol(valueStr, nullptr, 10);
-            if (value >= std::numeric_limits<int32_t>::max() ||
-                value <= std::numeric_limits<int32_t>::min() ||
-                value == 0) {
-                ALOGE("failed to parse integer vector at '%s' from '%s'", p, str.c_str());
-                return;
-            }
-            vector->push_back(int32_t(value));
-            i = valueStr[0] = 0;
-        } else {
-            valueStr[i++] = *p;
-            if (i == sizeof(valueStr) - 1) { // -1 because we need space for a null terminator
-                ALOGE("failed to parse integer vector at '%s' from '%s'", p, str.c_str());
-                return;
-            }
-        }
+    if (!mediametrics::stringutils::parseVector(str, vector)) {
+        ALOGE("failed to parse integer vector from '%s'", str.c_str());
     }
 }