merges r30597 from trunk into ruby_1_9_2.

--
* parse.y: avoid NULL reference.  [ruby-dev:43067]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30689 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 6 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 2c28f36ea2..1109c4916a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Jan 18 23:31:01 2011  Yusuke Endoh  <mame@tsg.ne.jp>
+
+	* parse.y: avoid NULL reference.  [ruby-dev:43067]
+
 Wed Jan 19 02:54:04 2011  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* vsnprintf.c (cvt): set first byte of buf to NUL for the case when
diff --git a/parse.y b/parse.y
index 7ef894df48..330213ca78 100644
--- a/parse.y
+++ b/parse.y
@@ -8652,6 +8652,7 @@ assign_in_cond(struct parser_params *parser, NODE *node)
 	return 0;
     }
 
+    if (!node->nd_value) return 1;
     switch (nd_type(node->nd_value)) {
       case NODE_LIT:
       case NODE_STR:
diff --git a/version.h b/version.h
index 07caa2f03f..c9a27d8d1f 100644
--- a/version.h
+++ b/version.h
@@ -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