From bd13788fdbe8617eb3a65e98ddb4acc2b5e4f598 Mon Sep 17 00:00:00 2001
From: normal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 13 Dec 2015 03:17:28 +0000
Subject: lib/shellwords.rb: do not change API with frozen-string-literal

This fixes a bug introduced in r53066 when attempting to
shellescape an empty string.

* lib/shellwords.rb (shellescape): duplicate frozen literal
* test/test_shellwords.rb (test_stringification): new test

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53068 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/shellwords.rb       |  2 +-
 test/test_shellwords.rb | 13 +++++++++++--
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/lib/shellwords.rb b/lib/shellwords.rb
index d02d3b06d5..66092c8999 100644
--- a/lib/shellwords.rb
+++ b/lib/shellwords.rb
@@ -125,7 +125,7 @@ module Shellwords
     str = str.to_s
 
     # An empty argument will be skipped, so return empty quotes.
-    return "''" if str.empty?
+    return "''".dup if str.empty?
 
     str = str.dup
 
diff --git a/test/test_shellwords.rb b/test/test_shellwords.rb
index 59cdbe96dc..e70e0d72bf 100644
--- a/test/test_shellwords.rb
+++ b/test/test_shellwords.rb
@@ -48,8 +48,17 @@ class TestShellwords < Test::Unit::TestCase
   end
 
   def test_stringification
-    assert_equal "3", shellescape(3)
-    assert_equal "ps -p #{$$}", ['ps', '-p', $$].shelljoin
+    three = shellescape(3)
+    assert_equal '3', three
+    assert_not_predicate three, :frozen?
+
+    empty = shellescape('')
+    assert_equal "''", empty
+    assert_not_predicate empty, :frozen?
+
+    joined = ['ps', '-p', $$].shelljoin
+    assert_equal "ps -p #{$$}", joined
+    assert_not_predicate joined, :frozen?
   end
 
   def test_multibyte_characters
-- 
cgit v1.2.3