commit 67e304ad9153b3d23e14d375cb1ccb498bb49a9d
author Vova Sharaienko <sharaienko@google.com> Fri Mar 29 01:34:47 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Mar 29 01:34:47 2024 +0000
tree 5f3a24d3ef35b183561ba66121834c46090c55ee
parent 4f6c56889356a5a422b59c71e9142875d00e43bf
parent 7073ff740a3caf7065e2d5b685107694ef352e19

Merge "[statsd] Added LogEvent parsing data safety check" into udc-mainline-prod

statsd/src/logd/LogEvent.cpp

diff --git a/statsd/src/logd/LogEvent.cpp b/statsd/src/logd/LogEvent.cpp
index 94fe5cf..affb080 100644
--- a/statsd/src/logd/LogEvent.cpp
+++ b/statsd/src/logd/LogEvent.cpp
@@ -266,7 +266,7 @@
 }
 
 // Assumes that mValues is not empty
-bool LogEvent::checkPreviousValueType(Type expected) {
+bool LogEvent::checkPreviousValueType(Type expected) const {
     return mValues[mValues.size() - 1].mValue.getType() == expected;
 }
 
@@ -283,7 +283,7 @@
     }
 
     // Allowed types: INT, repeated INT
-    if (numElements > mValues.size() || !checkPreviousValueType(INT) ||
+    if (mValues.empty() || numElements > mValues.size() || !checkPreviousValueType(INT) ||
         annotationType != BOOL_TYPE) {
         VLOG("Atom ID %d error while parseIsUidAnnotation()", mTagId);
         mValid = false;

statsd/src/logd/LogEvent.h

diff --git a/statsd/src/logd/LogEvent.h b/statsd/src/logd/LogEvent.h
index c34d34e..db2bc4e 100644
--- a/statsd/src/logd/LogEvent.h
+++ b/statsd/src/logd/LogEvent.h
@@ -296,7 +296,7 @@
     void parseStateNestedAnnotation(uint8_t annotationType, std::optional<uint8_t> numElements);
     void parseRestrictionCategoryAnnotation(uint8_t annotationType);
     void parseFieldRestrictionAnnotation(uint8_t annotationType);
-    bool checkPreviousValueType(Type expected);
+    bool checkPreviousValueType(Type expected) const;
     bool getRestrictedMetricsFlag();
 
     /**