From 54c2dcf231f1dce1972a3b55fee1123ff8ff0229 Mon Sep 17 00:00:00 2001
From: "Yukihiro \"Matz\" Matsumoto" <matz@ruby-lang.org>
Date: Mon, 19 May 2014 18:39:37 +0900
Subject: allow NULL (no variable) in lvar section of mrb format; fix #2294

This fix use UINT16_MAX for NULL symbol tag, that means maximum symbol length
is not UINT16_MAX-1.
---
 src/dump.c | 15 +++++++++++----
 src/load.c | 14 ++++++++++----
 2 files changed, 21 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/dump.c b/src/dump.c
index 3d55302e6..564c6888e 100644
--- a/src/dump.c
+++ b/src/dump.c
@@ -703,6 +703,7 @@ create_lv_sym_table(mrb_state *mrb, const mrb_irep *irep, mrb_sym **syms, uint32
 
   for (i = 0; i + 1 < irep->nlocals; ++i) {
     mrb_sym const name = irep->lv[i].name;
+    if (name == 0) continue;
     if (find_filename_index(*syms, *syms_len, name) != -1) continue;
 
     ++(*syms_len);
@@ -744,11 +745,17 @@ write_lv_record(mrb_state *mrb, const mrb_irep *irep, uint8_t **start, mrb_sym c
   size_t i;
 
   for (i = 0; i + 1 < irep->nlocals; ++i) {
-    int const sym_idx = find_filename_index(syms, syms_len, irep->lv[i].name);
-    mrb_assert(sym_idx != -1); /* local variable name must be in syms */
+    if (irep->lv[i].name == 0) {
+      cur += uint16_to_bin(RITE_LV_NULL_MARK, cur);
+      cur += uint16_to_bin(0, cur);
+    }
+    else {
+      int const sym_idx = find_filename_index(syms, syms_len, irep->lv[i].name);
+      mrb_assert(sym_idx != -1); /* local variable name must be in syms */
 
-    cur += uint16_to_bin(sym_idx, cur);
-    cur += uint16_to_bin(irep->lv[i].r, cur);
+      cur += uint16_to_bin(sym_idx, cur);
+      cur += uint16_to_bin(irep->lv[i].r, cur);
+    }
   }
 
   for (i = 0; i < irep->rlen; ++i) {
diff --git a/src/load.c b/src/load.c
index 668e6681e..0a877dd78 100644
--- a/src/load.c
+++ b/src/load.c
@@ -411,12 +411,18 @@ read_lv_record(mrb_state *mrb, const uint8_t *start, mrb_irep *irep, size_t *rec
   for (i = 0; i + 1< irep->nlocals; ++i) {
     uint16_t const sym_idx = bin_to_uint16(bin);
     bin += sizeof(uint16_t);
-    if (sym_idx >= syms_len) {
-      return MRB_DUMP_GENERAL_FAILURE;
+    if (sym_idx == RITE_LV_NULL_MARK) {
+      irep->lv[i].name = 0;
+      irep->lv[i].r = 0;
     }
-    irep->lv[i].name = syms[sym_idx];
+    else {
+      if (sym_idx >= syms_len) {
+        return MRB_DUMP_GENERAL_FAILURE;
+      }
+      irep->lv[i].name = syms[sym_idx];
 
-    irep->lv[i].r = bin_to_uint16(bin);
+      irep->lv[i].r = bin_to_uint16(bin);
+    }
     bin += sizeof(uint16_t);
   }
 
-- 
cgit v1.2.3