commit cf28f28347d65e352f429263500f982ae3e51aed
author Joshua Haberman <jhaberman@gmail.com> Wed Feb 03 17:59:10 2021 -0800
committer GitHub <noreply@github.com> Wed Feb 03 17:59:10 2021 -0800
tree 9d3253a775f6a556f57fc481865b686092dc103f
parent aa13fde017cc5f55fe8df8aa7c0c98ccd7ece386

Updated upb to allow nonzero offset minutes in JSON timestamps. (#8258)

* Updated upb to allow nonzero offset minutes in JSON timestamps.

This is to pick up https://github.com/protocolbuffers/upb/pull/367

* Reverted error message change.

* Fixed quote chars.

ruby/ext/google/protobuf_c/ruby-upb.c

diff --git a/ruby/ext/google/protobuf_c/ruby-upb.c b/ruby/ext/google/protobuf_c/ruby-upb.c
index 9c048da..a7aeda2 100755
--- a/ruby/ext/google/protobuf_c/ruby-upb.c
+++ b/ruby/ext/google/protobuf_c/ruby-upb.c
@@ -7793,7 +7793,8 @@
 
   {
     /* [+-]08:00 or Z */
-    int ofs = 0;
+    int ofs_hour = 0;
+    int ofs_min = 0;
     bool neg = false;
 
     if (ptr == end) goto malformed;
@@ -7804,9 +7805,10 @@
         /* fallthrough */
       case '+':
         if ((end - ptr) != 5) goto malformed;
-        ofs = jsondec_tsdigits(d, &ptr, 2, ":00");
-        ofs *= 60 * 60;
-        seconds.int64_val += (neg ? ofs : -ofs);
+        ofs_hour = jsondec_tsdigits(d, &ptr, 2, ":");
+        ofs_min = jsondec_tsdigits(d, &ptr, 2, NULL);
+        ofs_min = ((ofs_hour * 60) + ofs_min) * 60;
+        seconds.int64_val += (neg ? ofs_min : -ofs_min);
         break;
       case 'Z':
         if (ptr != end) goto malformed;