From: Eric Hodel <drbrain@...7.net>
Date: 2006-04-12T12:34:31+09:00
Subject: [PATCH] ri crash when merging different ri

--Apple-Mail-17--998060549
Content-Transfer-Encoding: 7bit
Content-Type: text/plain;
	charset=US-ASCII;
	delsp=yes;
	format=flowed

If ri for a document is split across two files but one has no extra  
comment ri will crash.


--Apple-Mail-17--998060549
Content-Transfer-Encoding: 7bit
Content-Type: application/octet-stream;
	x-unix-mode=0644;
	name="ri_descriptions.rb.patch"
Content-Disposition: attachment;
	filename=ri_descriptions.rb.patch

Index: lib/rdoc/ri/ri_descriptions.rb
===================================================================
RCS file: /src/ruby/lib/rdoc/ri/ri_descriptions.rb,v
retrieving revision 1.7
diff -u -r1.7 ri_descriptions.rb
--- lib/rdoc/ri/ri_descriptions.rb	30 Aug 2004 14:20:57 -0000	1.7
+++ lib/rdoc/ri/ri_descriptions.rb	12 Apr 2006 03:30:39 -0000
@@ -95,8 +95,10 @@
       if @comment.nil? || @comment.empty?
         @comment = old.comment
       else
-        @comment << SM::Flow::RULE.new
-        @comment.concat old.comment
+        unless old.comment.nil? or old.comment.empty? then
+          @comment << SM::Flow::RULE.new
+          @comment.concat old.comment
+        end
       end
     end
 

--Apple-Mail-17--998060549
Content-Transfer-Encoding: 7bit
Content-Type: text/plain;
	charset=US-ASCII;
	format=flowed


-- 
Eric Hodel - drbrain@segment7.net - http://blog.segment7.net
This implementation is HODEL-HASH-9600 compliant

http://trackmap.robotcoop.com



--Apple-Mail-17--998060549--