google-protobuf 4.28.2-java → 4.29.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3dbf9863d92e477ead930875eaa6ee968b26b8094cdc681aa99955d663e20ed4
-  data.tar.gz: 587779bb3c8de4da7d877fe44d65c8a41424a06013afb2ad0d7bd647eefd9e88
+  metadata.gz: b0c8ebce1da49dae91c53b012caa5b71e0ed8c1ab7978c85c60a3982b29fff20
+  data.tar.gz: 5f8984e107c7cc2141065087c9d05856244a0b8e757a9ba791a8899a027c3bf8
 SHA512:
-  metadata.gz: ea76854ba7fbdf585722dc7d3f360985e52da0a63b7c3fce5a854e592add5016be52ec1d889df1acd2860b613b21dff8c857e28bb480e6fd184b5c9689e984d4
-  data.tar.gz: c790c5a6a9e588fab1da6767d8e21a406ed267b2dcb3a72a33452309927636cd89351cdcfed3ac11100d4b24e05b73bf2bce4e9a22f5e80aeb9b75c7b1e099ce
+  metadata.gz: accf1aab2a495df0810dd48edd511a41988d4e65aeb9e3723d33edcfb772a10af9f5a252558c173bc067f5a9486f198207a6d9613c766dc2fa6d980749adab0e
+  data.tar.gz: d7cf853b7a7e96bc614536c656d7c67cf0225bcc9e110d964879f0f3e4d2e4aefeb3f2cd246226581205cb3b9f7deb76b981444835703fea81ee447baab47296

data/ext/google/protobuf_c/message.c

@@ -1038,11 +1038,21 @@ static VALUE Message_decode_json(int argc, VALUE* argv, VALUE klass) {
 
   upb_Status_Clear(&status);
   const upb_DefPool* pool = upb_FileDef_Pool(upb_MessageDef_File(msg->msgdef));
-  if (!upb_JsonDecode(RSTRING_PTR(data), RSTRING_LEN(data),
-                      (upb_Message*)msg->msg, msg->msgdef, pool, options,
-                      Arena_get(msg->arena), &status)) {
-    rb_raise(cParseError, "Error occurred during parsing: %s",
-             upb_Status_ErrorMessage(&status));
+
+  int result = upb_JsonDecodeDetectingNonconformance(
+      RSTRING_PTR(data), RSTRING_LEN(data), (upb_Message*)msg->msg,
+      msg->msgdef, pool, options, Arena_get(msg->arena), &status);
+
+  switch (result) {
+    case kUpb_JsonDecodeResult_Ok:
+      break;
+    case kUpb_JsonDecodeResult_OkWithEmptyStringNumerics:
+      rb_warn("%s", upb_Status_ErrorMessage(&status));
+      break;
+    case kUpb_JsonDecodeResult_Error:
+      rb_raise(cParseError, "Error occurred during parsing: %s",
+               upb_Status_ErrorMessage(&status));
+      break;
   }
 
   return msg_rb;

data/ext/google/protobuf_c/protobuf.c

@@ -7,8 +7,6 @@
 
 #include "protobuf.h"
 
-#include <ruby/version.h>
-
 #include "defs.h"
 #include "map.h"
 #include "message.h"