Make embedded string length a long for VWA

A short (2 bytes) will cause unaligned struct accesses when strings are used as a buffer to directly store binary data.
NathanZook · Jan 12, 2022 · 2d81a71 · 2d81a71
1 parent e28dbd0
commit 2d81a71
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/include/ruby/internal/core/rstring.h b/include/ruby/internal/core/rstring.h
@@ -280,7 +280,7 @@ struct RString {
         /** Embedded contents. */
         struct {
 #if USE_RVARGC
-            unsigned short len;
+            long len;
             /* This is a length 1 array because:
              *   1. GCC has a bug that does not optimize C flexible array members
              *      (https://gcc.gnu.org/bugzilla/show_bug.cgi?id=102452)

diff --git a/test/-ext-/string/test_capacity.rb b/test/-ext-/string/test_capacity.rb
@@ -66,7 +66,7 @@ def capa(str)
 
   def embed_header_size
     if GC.using_rvargc?
-      2 * RbConfig::SIZEOF['void*'] + RbConfig::SIZEOF['short']
+      2 * RbConfig::SIZEOF['void*'] + RbConfig::SIZEOF['long']
     else
       2 * RbConfig::SIZEOF['void*']
     end