fail at field type mismatch in json2pb

apache · Apr 23, 2024 · d15f67a · d15f67a
1 parent 6a335aa
commit d15f67a
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/src/json2pb/json_to_pb.cpp b/src/json2pb/json_to_pb.cpp
@@ -334,11 +334,17 @@ static bool JsonValueToProtoField(const BUTIL_RAPIDJSON_NAMESPACE::Value& value,
                     const BUTIL_RAPIDJSON_NAMESPACE::Value & item = value[index];       \
                     if (TYPE_MATCH == J2PCHECKTYPE(item, cpptype, jsontype)) { \
                         reflection->Add##method(message, field, item.Get##jsontype()); \
+                    } else {                                             \
+                        J2PERROR_WITH_PB(message, err, "Type mismatch"); \
+                        return false;                                    \
                     }                                                   \
                 }                                                       \
             } else if (TYPE_MATCH == J2PCHECKTYPE(value, cpptype, jsontype)) { \
                 reflection->Set##method(message, field, value.Get##jsontype()); \
-            }                                                           \
+            } else {                                                   \
+                J2PERROR_WITH_PB(message, err, "Type mismatch");       \
+                return false;                                          \
+            }                                                          \
             break;                                                      \
         }                                                               \
 
@@ -430,7 +436,10 @@ static bool JsonValueToProtoField(const BUTIL_RAPIDJSON_NAMESPACE::Value& value,
                         str = str_decoded;
                     }
                     reflection->AddString(message, field, str);
-                }  
+                } else {
+                    J2PERROR_WITH_PB(message, err, "Type mismatch");
+                    return false;
+                }
             }
         } else if (TYPE_MATCH == J2PCHECKTYPE(value, string, String)) {
             std::string str(value.GetString(), value.GetStringLength());
@@ -444,6 +453,9 @@ static bool JsonValueToProtoField(const BUTIL_RAPIDJSON_NAMESPACE::Value& value,
                 str = str_decoded;
             }
             reflection->SetString(message, field, str);
+        } else {
+            J2PERROR_WITH_PB(message, err, "Type mismatch");
+            return false;
         }
         break;