yugui	2011-01-28 11:25:22 +0900 (Fri, 28 Jan 2011)

  New Revision: 30689

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=30689

  Log:
    merges r30597 from trunk into ruby_1_9_2.
    --
    * parse.y: avoid NULL reference.  [ruby-dev:43067]

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/parse.y
    branches/ruby_1_9_2/version.h

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 30688)
+++ ruby_1_9_2/ChangeLog	(revision 30689)
@@ -1,3 +1,7 @@
+Tue Jan 18 23:31:01 2011  Yusuke Endoh  <mame@t...>
+
+	* parse.y: avoid NULL reference.  [ruby-dev:43067]
+
 Wed Jan 19 02:54:04 2011  NARUSE, Yui  <naruse@r...>
 
 	* vsnprintf.c (cvt): set first byte of buf to NUL for the case when
Index: ruby_1_9_2/parse.y
===================================================================
--- ruby_1_9_2/parse.y	(revision 30688)
+++ ruby_1_9_2/parse.y	(revision 30689)
@@ -8652,6 +8652,7 @@
 	return 0;
     }
 
+    if (!node->nd_value) return 1;
     switch (nd_type(node->nd_value)) {
       case NODE_LIT:
       case NODE_STR:
Index: ruby_1_9_2/version.h
===================================================================
--- ruby_1_9_2/version.h	(revision 30688)
+++ ruby_1_9_2/version.h	(revision 30689)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.2"
-#define RUBY_PATCHLEVEL 166
+#define RUBY_PATCHLEVEL 167
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 9
 #define RUBY_VERSION_TEENY 1

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/