Fixed conformance test regression: empty string wrapper.

protocolbuffers · Oct 30, 2019 · 5f25400 · 5f25400
1 parent aae5c49
commit 5f25400
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 1 deletion.
diff --git a/ruby/ext/google/protobuf_c/encode_decode.c b/ruby/ext/google/protobuf_c/encode_decode.c
@@ -626,6 +626,14 @@ static bool uint32wrapper_handler(void* closure, const void* hd, uint32_t val) {
   return true;
 }
 
+static void* startstringwrapper_handler(void* closure, const void* hd,
+                                        size_t size_hint) {
+  VALUE* rbval = closure;
+  (void)size_hint;
+  *rbval = get_frozen_string(NULL, 0, false);
+  return closure;
+}
+
 static size_t stringwrapper_handler(void* closure, const void* hd,
                                     const char* ptr, size_t len,
                                     const upb_bufhandle* handle) {
@@ -634,6 +642,14 @@ static size_t stringwrapper_handler(void* closure, const void* hd,
   return len;
 }
 
+static void* startbyteswrapper_handler(void* closure, const void* hd,
+                                       size_t size_hint) {
+  VALUE* rbval = closure;
+  (void)size_hint;
+  *rbval = get_frozen_string(NULL, 0, true);
+  return closure;
+}
+
 static size_t byteswrapper_handler(void* closure, const void* hd,
                                    const char* ptr, size_t len,
                                    const upb_bufhandle* handle) {
@@ -760,9 +776,11 @@ static void add_handlers_for_wrapper(const upb_msgdef* msgdef,
       upb_handlers_setuint32(h, f, uint32wrapper_handler, NULL);
       break;
     case UPB_WELLKNOWN_STRINGVALUE:
+      upb_handlers_setstartstr(h, f, startstringwrapper_handler, NULL);
       upb_handlers_setstring(h, f, stringwrapper_handler, NULL);
       break;
     case UPB_WELLKNOWN_BYTESVALUE:
+      upb_handlers_setstartstr(h, f, startbyteswrapper_handler, NULL);
       upb_handlers_setstring(h, f, byteswrapper_handler, NULL);
       break;
     case UPB_WELLKNOWN_BOOLVALUE:

diff --git a/ruby/tests/common_tests.rb b/ruby/tests/common_tests.rb
@@ -1411,7 +1411,6 @@ def test_oneof_wrappers
     run_test.call(m)
     m.oneof_bytes_as_value = 'fun'
     run_test.call(m)
-    puts m
   end
 
   def test_top_level_wrappers