google-protobuf 4.28.2-aarch64-linux → 4.29.0-aarch64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 11f3027a92d90a0734b66ca64c3add02f840a825c60084e48d165f2634c46578
-  data.tar.gz: 20e680c3c2b9dd0b3cbacbda4616a0d6ab357ad16c3a050a165c2add6000c4c5
+  metadata.gz: b1173907911c3c1679ddcb394a008a8804d68a78c758524504e3c9225fa0f861
+  data.tar.gz: 7872ef2a97badccc8a887f658402c828277b5e05224067c2919859f926798012
 SHA512:
-  metadata.gz: a29ac7966fda880bb753a464d871388dd3b95f2ff3a81bb4b4c379fd49cc6c660cebc36eb27f652eb8efcd36c66c8ec3fa7377b0a9fa603ddfd2a4f41cdaf245
-  data.tar.gz: 6c7a6249673e74b4435ba71afedc48394634b16b3cc901b392e67d0b78c667a2cbe0ba275e7ccb697bb3312918a0f65e5291512b425d53d8cfe6a8da6843b8fd
+  metadata.gz: 95538ae513f8e389c2ddd2e0d7efd8139407fd49bdec10d7c55f6a3ad99fdd582e4da1f36c3ce2b9f3af9c3bb539427e4d2126fd71119293ce980a565b7d831d
+  data.tar.gz: 7bc974e30e5f6b85b9073c39f1c4baf84ee10f42580c4424b9f81c744c01363359c7b7412ee1c44bc9427afbd4b860a6f8a03f399f600196d07ff2610358c3c5

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"