From 796c57432250c91ba45a6c29a516185c5746cd3a Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 10 May 2008 13:15:13 +0000
Subject: * string.c (tr_trans): single '^' does not mean negation.  
 [ruby-dev:34632]

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@16347 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 string.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'string.c')

diff --git a/string.c b/string.c
index 3c8cdd3f0..3bb6780e4 100644
--- a/string.c
+++ b/string.c
@@ -4243,7 +4243,9 @@ 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 && rb_enc_ascget(trsrc.p, trsrc.pend, &l, enc) == '^') {
+    if (RSTRING_LEN(str) > 1 &&
+	rb_enc_ascget(trsrc.p, trsrc.pend, &l, enc) == '^' &&
+	trsrc.p + l < trsrc.pend) {
 	cflag = 1;
 	trsrc.p += l;
     }
-- 
cgit