summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--string.c2
-rw-r--r--version.h6
3 files changed, 7 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 0b4f2d20c..bc7d09675 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@ Sat May 10 22:14:03 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* string.c (tr_trans): single '^' does not mean negation.
[ruby-dev:34632]
+ * string.c (tr_trans): should check src size, not str size.
+ [ruby-dev:34637]
+
Sat May 10 18:11:18 2008 Yukihiro Matsumoto <matz@ruby-lang.org>
* string.c (rb_str_each_line): zero length record separator should
diff --git a/string.c b/string.c
index 3bb6780e4..1de91ff52 100644
--- a/string.c
+++ b/string.c
@@ -4243,7 +4243,7 @@ tr_trans(VALUE str, VALUE src, VALUE repl, int sflag)
enc = rb_enc_check(src, repl);
}
trsrc.p = RSTRING_PTR(src); trsrc.pend = trsrc.p + RSTRING_LEN(src);
- if (RSTRING_LEN(str) > 1 &&
+ if (RSTRING_LEN(src) > 1 &&
rb_enc_ascget(trsrc.p, trsrc.pend, &l, enc) == '^' &&
trsrc.p + l < trsrc.pend) {
cflag = 1;
diff --git a/version.h b/version.h
index 351f4e1e4..dab59aa07 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
#define RUBY_VERSION "1.9.0"
-#define RUBY_RELEASE_DATE "2008-05-10"
+#define RUBY_RELEASE_DATE "2008-05-11"
#define RUBY_VERSION_CODE 190
-#define RUBY_RELEASE_CODE 20080510
+#define RUBY_RELEASE_CODE 20080511
#define RUBY_PATCHLEVEL 0
#define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
#define RUBY_VERSION_TEENY 0
#define RUBY_RELEASE_YEAR 2008
#define RUBY_RELEASE_MONTH 5
-#define RUBY_RELEASE_DAY 10
+#define RUBY_RELEASE_DAY 11
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];