[macruby-changes] [5047] MacRuby/trunk/string.c

[source_changes at macosforge.org]

Revision: 5047
          http://trac.macosforge.org/projects/ruby/changeset/5047
Author:   lsansonetti at apple.com
Date:     2010-12-17 15:29:21 -0800 (Fri, 17 Dec 2010)
Log Message:
-----------
fix a bug in String#gsub! where we would segfault during string concatenation

Modified Paths:
--------------
    MacRuby/trunk/string.c

Modified: MacRuby/trunk/string.c
===================================================================
--- MacRuby/trunk/string.c	2010-12-17 13:11:17 UTC (rev 5046)
+++ MacRuby/trunk/string.c	2010-12-17 23:29:21 UTC (rev 5047)
@@ -3920,8 +3920,10 @@
 		return bang ? Qnil : rstr_dup(str, 0);
 	    }
 	    if (last < len) {
-		str_concat_string(RSTR(dest),
-			RSTR(rstr_substr(str, last, len - last)));
+		VALUE substr = rstr_substr(str, last, len - last);
+		if (substr != Qnil) {
+		    str_concat_string(RSTR(dest), RSTR(substr));
+		}
 	    }
 	    break;
 	}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macruby-changes/attachments/20101217/ae4a2d03/attachment.html>