Fixed the way we parse integers when doing map->vector conversions.

Previously, strings with leading 0's would convert those strings to integers. This doesn't match the behavior of other platforms though, where leading zeroes cause a key to be treated as a string instead of an integer. E.G. the string "001" should not parse to the integer 1.

PiperOrigin-RevId: 270724879

Author: amablue

database/src/desktop/util_desktop.cc

@@ -437,6 +437,10 @@ bool HasVector(const Variant& variant) {
 bool ParseInteger(const char* str, int32_t* output) {
   assert(output);
   assert(str);
+  // Integers must not have leading zeroes.
+  if (str[0] == '0' && str[1] != '\0') {
+    return false;
+  }
   // Check if the key is numeric
   bool is_int = false;
   char* end_ptr = nullptr;
@@ -449,32 +453,30 @@ bool ParseInteger(const char* str, int32_t* output) {
 }
 
 // Convert one level of map to vector if applicable.
-// Convert map to vector if
-// 1. map is not empty
-// 2. All the key are numeric
-// 3. If less or equal to half of the keys in the array is missing
+// Convert map to vector if:
+//   1. map is not empty and
+//   2. All the key are numeric and
+//   3. If less or equal to half of the keys in the array is missing.
 // This function assume no priority information remains in the variant.
 void ConvertMapToVector(Variant* variant) {
   assert(variant);
 
   if (variant->is_map() && !variant->map().empty()) {
     int64_t max_index = -1;
-    bool all_numeric = true;
     for (auto& it_child : variant->map()) {
       // Check if the key is numeric
       int32_t parse_value = 0;
       bool is_number =
           ParseInteger(it_child.first.string_value(), &parse_value);
       if (!is_number || parse_value < 0) {
-        all_numeric = false;
         // If any one of the key is not numeric, there is no need to verify
         // other keys
-        break;
+        return;
       }
       max_index = max_index < parse_value ? parse_value : max_index;
     }
 
-    if (all_numeric && max_index < (2 * variant->map().size())) {
+    if (max_index < (2 * variant->map().size())) {
       Variant array_result(
           std::vector<Variant>(max_index + 1, Variant::Null()));
       for (int i = 0; i <= max_index; ++i) {

database/src/desktop/util_desktop.h

@@ -188,7 +188,10 @@ size_t GetEffectiveChildren(const Variant& variant,
 // Check if the variant or any of its children is vector.
 bool HasVector(const Variant& variant);
 
-// Parse a base-ten input string into 32-bit integer
+// Parse a base-ten input string into 32-bit integer. Strings are parsed as
+// integers if they do not have leading 0's - if they do they are simply treated
+// as strings. This is done to match the behavior of the other database
+// implementations.
 bool ParseInteger(const char* str, int32_t* output);
 
 // Prune the priorities and convert map into vector if applicable, to the