google-protobuf 4.28.2-arm64-darwin → 4.29.0-arm64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d521a550d7894486341b998acf2ec8b6c4b3ea0141c1031c1c68fe5cb4b7d750
-  data.tar.gz: b8f7e150ecaa6d829e56782811be7c8f6fc3838b44c3ceb478e6efae4acaa26d
+  metadata.gz: f98a48f764713eb7de63b11586a53a83700d03218700b5bea98562ea2b7cebda
+  data.tar.gz: 78782b61cb7e4803ddfa54b29bd63617f1104fb0c091ba8709ef24400ae72ff4
 SHA512:
-  metadata.gz: 9d3a1e501815145b42485386cf11359b2935f78300e3c560807b255d9a3a92dd06231d734281265e37b8e25baa1d11cb73238c7000f46d190e6690c7a5ac710b
-  data.tar.gz: 16389af93c59826ba388f5356fcc50ab1c7bf16815e3940aacbc0e79e55904f3d8bafa307c1577b5b25ea608effb9ad7dfd94e4073f5286db555903cdd8afac7
+  metadata.gz: 6d59b91b88e82c869e7ccf75e9a69eb5bd8ee67cad3559726b4a299fe58a4771156a7121e9bb19dacc4b25f261f32c768a23d361ae9d8488a8b141d8c5dc71f0
+  data.tar.gz: aac5aec8e954e9d8459ca8ead8c63a91678a5187ecdd4cdd65650560a71c7f8722f82bd44079d94ea83b7d18e0b7338fcc2466b7b58cca374517c2de905b984e

data/ext/google/protobuf_c/defs.c

@@ -7,7 +7,6 @@
 
 #include <ctype.h>
 #include <errno.h>
-#include <ruby/version.h>
 
 #include "convert.h"
 #include "message.h"

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"