Merge pull request #4279 from dearblue/fix-inline-packed-symbols

Fix destroyed "inline packed symbols" on 32 bit mode with `MRB_WORD_BOXING`

2 files changed, 9 insertions, 2 deletions

diff --git a/include/mruby/value.h b/include/mruby/value.h
index f988826ca..1ed20858f 100644
--- a/include/mruby/value.h
+++ b/include/mruby/value.h
@@ -160,6 +160,10 @@ typedef void mrb_value;
 #ifndef mrb_bool
 #define mrb_bool(o)   (mrb_type(o) != MRB_TT_FALSE)
 #endif
+#if !defined(MRB_SYMBOL_BITSIZE)
+#define MRB_SYMBOL_BITSIZE (sizeof(mrb_sym) * CHAR_BIT)
+#define MRB_SYMBOL_MAX      UINT32_MAX
+#endif
 #ifndef MRB_WITHOUT_FLOAT
 #define mrb_float_p(o) (mrb_type(o) == MRB_TT_FLOAT)
 #endif
diff --git a/src/symbol.c b/src/symbol.c
index e09e9019d..8424cecd9 100644
--- a/src/symbol.c
+++ b/src/symbol.c
@@ -34,13 +34,16 @@ static const char pack_table[] = "_abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRS
 static mrb_sym
 sym_inline_pack(const char *name, uint16_t len)
 {
+  const int lower_length_max = (MRB_SYMBOL_BITSIZE - 2) / 5;
+  const int mix_length_max   = (MRB_SYMBOL_BITSIZE - 2) / 6;
+
   char c;
   const char *p;
   int i;
   mrb_sym sym = 0;
   int lower = 1;
 
-  if (len > 6) return 0;        /* too long */
+  if (len > lower_length_max) return 0; /* too long */
   for (i=0; i<len; i++) {
     uint32_t bits;
 
@@ -64,7 +67,7 @@ sym_inline_pack(const char *name, uint16_t len)
     }
     return sym | 3;
   }
-  if (len == 6) return 0;
+  if (len > mix_length_max) return 0;
   return sym | 1;
 }