merge r23454.

* lib/rss/parser.rb: add nil check.


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

2 files changed, 5 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index d7ccfa889b..a8cb8a4188 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat May 16 19:50:34 2009  Kouhei Sutou  <kou@cozmixng.org>
+
+	* lib/rss/parser.rb: add nil check.
+
 Sat May 16 19:48:29 2009  Kouhei Sutou  <kou@cozmixng.org>
 
 	* lib/rss/parser.rb, test/test_parser_1.0.rb: fix foaf:Image
diff --git a/lib/rss/parser.rb b/lib/rss/parser.rb
index 359c01419e..f6e192e567 100644
--- a/lib/rss/parser.rb
+++ b/lib/rss/parser.rb
@@ -446,7 +446,7 @@ module RSS
     def start_get_text_element(tag_name, prefix, ns, required_uri)
       pr = Proc.new do |text, tags|
         setter = self.class.setter(required_uri, tag_name)
-        if @last_element.respond_to?(setter)
+        if setter and @last_element.respond_to?(setter)
           if @do_validate
             getter = self.class.getter(required_uri, tag_name)
             if @last_element.__send__(getter)