* parse.y (rb_parser_append_print, rb_parser_while_loop): moved check

  for node to the head.

* ruby.c (proc_options): do nothing for -p/-n options if tree is null.
  submitted by Yusuke ENDOH <mame AT tsg.ne.jp> at [ruby-dev:31243].


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@12812 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 6 insertions, 2 deletions

diff --git a/parse.y b/parse.y
index fe73bc23b..d31a2c82e 100644
--- a/parse.y
+++ b/parse.y
@@ -8110,11 +8110,13 @@ rb_parser_append_print(VALUE vparser, NODE *node)
     NODE *scope = node;
     struct parser_params *parser;
 
+    if (!node) return node;
+
     Data_Get_Struct(vparser, struct parser_params, parser);
 
     node = node->nd_body;
 
-    if (node && (nd_type(node) == NODE_PRELUDE)) {
+    if (nd_type(node) == NODE_PRELUDE) {
 	prelude = node;
 	node = node->nd_body;
     }
@@ -8140,11 +8142,13 @@ rb_parser_while_loop(VALUE vparser, NODE *node, int chop, int split)
     NODE *scope = node;
     struct parser_params *parser;
 
+    if (!node) return node;
+
     Data_Get_Struct(vparser, struct parser_params, parser);
 
     node = node->nd_body;
 
-    if (node && (nd_type(node) == NODE_PRELUDE)) {
+    if (nd_type(node) == NODE_PRELUDE) {
 	prelude = node;
 	node = node->nd_body;
     }