From bfa3763a21d05ff854ce02212f1ed9ab89990d52 Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 24 Sep 2008 07:00:43 +0000
Subject: * string.c (rb_str_rstrip_bang): removing mixed spaces and nuls at  
 the end of strings.  [ruby-dev:36497]

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

(limited to 'string.c')

diff --git a/string.c b/string.c
index 46c190835..33d03e13c 100644
--- a/string.c
+++ b/string.c
@@ -5861,11 +5861,8 @@ rb_str_rstrip_bang(VALUE str)
     t = e = RSTRING_END(str);
 
     if (single_byte_optimizable(str)) {
-        /* remove trailing '\0's */
-        while (s < t && t[-1] == '\0') t--;
-      
-	/* remove trailing spaces */
-	while (s < t && rb_enc_isspace(*(t-1), enc)) t--;
+	/* remove trailing spaces or '\0's */
+	while (s < t && (t[-1] == '\0' || rb_enc_isspace(*(t-1), enc))) t--;
     }
     else {
 	char *tp;
-- 
cgit