summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarcandre <marcandre@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-04-30 02:48:49 +0000
committermarcandre <marcandre@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-04-30 02:48:49 +0000
commit479fa407780ca01ce04dce1ef21342da4e148215 (patch)
tree4126f7ec9b14dd47e8c22a7ca680a9fcc631e0db
parent478c3e080b0d2782ae630f87c22d1a8e36756778 (diff)
* string.c (rb_str_sub_bang): String#sub! now raises an error when
called on a frozen string, even if no change is made. See [ruby-core:23657] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27559 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--string.c1
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index ecd03ab87e..57b6512b1a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Apr 30 11:48:31 2010 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
+
+ * string.c (rb_str_sub_bang): String#sub! now raises an error when
+ called on a frozen string, even if no change is made.
+ See [ruby-core:23657]
+
Fri Apr 30 11:40:44 2010 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
* eval.c (make_exception, rb_obj_extend): Fix error messages in case
diff --git a/string.c b/string.c
index b4e105aa78..caca178fc4 100644
--- a/string.c
+++ b/string.c
@@ -3466,6 +3466,7 @@ rb_str_sub_bang(int argc, VALUE *argv, VALUE str)
}
pat = get_pat(argv[0], 1);
+ str_modifiable(str);
if (rb_reg_search(pat, str, 0, 0) >= 0) {
rb_encoding *enc;
int cr = ENC_CODERANGE(str);