From cfd162d535c7a4f8b1f95255cc6be696a8b75557 Mon Sep 17 00:00:00 2001
From: Jeremy Evans <code@jeremyevans.net>
Date: Tue, 9 Feb 2021 13:50:36 -0800
Subject: Make String#{strip,lstrip}{,!} strip leading NUL bytes

The documentation already specifies that they strip whitespace
and defines whitespace to include null.

This wraps the new behavior in the appropriate guards in the specs,
but does not specify behavior for previous versions, because this
is a bug that could be backported.

Fixes [Bug #17467]
---
 spec/ruby/core/string/lstrip_spec.rb | 18 ++++++++++++------
 spec/ruby/core/string/strip_spec.rb  | 22 ++++++++++------------
 2 files changed, 22 insertions(+), 18 deletions(-)

(limited to 'spec/ruby/core')

diff --git a/spec/ruby/core/string/lstrip_spec.rb b/spec/ruby/core/string/lstrip_spec.rb
index 12c7b13200..6b40189500 100644
--- a/spec/ruby/core/string/lstrip_spec.rb
+++ b/spec/ruby/core/string/lstrip_spec.rb
@@ -7,11 +7,13 @@ describe "String#lstrip" do
    "  hello world  ".lstrip.should == "hello world  "
    "\n\r\t\n\v\r hello world  ".lstrip.should == "hello world  "
    "hello".lstrip.should == "hello"
-   "\000 \000hello\000 \000".lstrip.should == "\000 \000hello\000 \000"
   end
 
-  it "does not strip leading \\0" do
-   "\x00hello".lstrip.should == "\x00hello"
+  ruby_version_is '3.1' do
+    it "strips leading \\0" do
+     "\x00hello".lstrip.should == "hello"
+     "\000 \000hello\000 \000".lstrip.should == "hello\000 \000"
+    end
   end
 
   ruby_version_is ''...'2.7' do
@@ -28,10 +30,14 @@ describe "String#lstrip!" do
     a = "  hello  "
     a.lstrip!.should equal(a)
     a.should == "hello  "
+  end
 
-    a = "\000 \000hello\000 \000"
-    a.lstrip!
-    a.should == "\000 \000hello\000 \000"
+  ruby_version_is '3.1' do
+    it "strips leading \\0" do
+      a = "\000 \000hello\000 \000"
+      a.lstrip!
+      a.should == "hello\000 \000"
+    end
   end
 
   it "returns nil if no modifications were made" do
diff --git a/spec/ruby/core/string/strip_spec.rb b/spec/ruby/core/string/strip_spec.rb
index 252d4a9cc3..463a9fedf3 100644
--- a/spec/ruby/core/string/strip_spec.rb
+++ b/spec/ruby/core/string/strip_spec.rb
@@ -6,11 +6,12 @@ describe "String#strip" do
     "   hello   ".strip.should == "hello"
     "   hello world   ".strip.should == "hello world"
     "\tgoodbye\r\v\n".strip.should == "goodbye"
-    "\x00 goodbye \x00".strip.should == "\x00 goodbye"
   end
 
-  it "returns a copy of self with trailing NULL bytes and whitespace" do
-    " \x00 goodbye \x00 ".strip.should == "\x00 goodbye"
+  ruby_version_is '3.1' do
+    it "returns a copy of self without leading and trailing NULL bytes and whitespace" do
+      " \x00 goodbye \x00 ".strip.should == "goodbye"
+    end
   end
 
   ruby_version_is ''...'2.7' do
@@ -31,11 +32,6 @@ describe "String#strip!" do
     a = "\tgoodbye\r\v\n"
     a.strip!
     a.should == "goodbye"
-
-    a = "\000 goodbye \000"
-    a.strip!
-    a.should == "\000 goodbye"
-
   end
 
   it "returns nil if no modifications where made" do
@@ -44,10 +40,12 @@ describe "String#strip!" do
     a.should == "hello"
   end
 
-  it "modifies self removing trailing NULL bytes and whitespace" do
-    a = " \x00 goodbye \x00 "
-    a.strip!
-    a.should == "\x00 goodbye"
+  ruby_version_is '3.1' do
+    it "removes leading and trailing NULL bytes and whitespace" do
+      a = "\000 goodbye \000"
+      a.strip!
+      a.should == "goodbye"
+    end
   end
 
   it "raises a FrozenError on a frozen instance that is modified" do
-- 
cgit v1.2.3