taint resulting String in Date#strftime

eregon · Sep 20, 2013 · 497eae4 · 497eae4
1 parent ae6188d
commit 497eae4
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 6 deletions.
diff --git a/core/src/main/java/org/jruby/RubyTime.java b/core/src/main/java/org/jruby/RubyTime.java
@@ -422,8 +422,7 @@ public RubyTime getlocal19(ThreadContext context, IRubyObject[] args) {
     @JRubyMethod(name = "strftime", required = 1)
     public RubyString strftime(IRubyObject format) {
         final RubyDateFormat rdf = getRuntime().getCurrentContext().getRubyDateFormat();
-        ByteList result = rdf.compileAndFormat(format.convertToString().getByteList(), false, dt, nsec, null);
-        return getRuntime().newString(result);
+        return rdf.compileAndFormat(format.convertToString(), false, dt, nsec, null);
     }
 
     @JRubyMethod(name = "==", required = 1, compat= CompatVersion.RUBY1_9)

diff --git a/core/src/main/java/org/jruby/util/RubyDateFormat.java b/core/src/main/java/org/jruby/util/RubyDateFormat.java
@@ -49,6 +49,7 @@
 import org.joda.time.DateTime;
 import org.joda.time.chrono.GJChronology;
 import org.joda.time.chrono.JulianChronology;
+import org.jruby.RubyString;
 import org.jruby.lexer.StrftimeLexer;
 import org.jruby.runtime.ThreadContext;
 import org.jruby.runtime.builtin.IRubyObject;
@@ -65,6 +66,8 @@ public class RubyDateFormat {
     static enum Format {
         /** encoding to give to output */
         FORMAT_ENCODING,
+        /** taint output */
+        FORMAT_TAINT,
         /** raw string, no formatting */
         FORMAT_STRING,
         /** formatter */
@@ -238,7 +241,8 @@ private void addToPattern(List<Token> compiledPattern, String str) {
         }
     }
 
-    public List<Token> compilePattern(ByteList pattern, boolean dateLibrary) {
+    public List<Token> compilePattern(RubyString format, boolean dateLibrary) {
+        ByteList pattern = format.getByteList();
         List<Token> compiledPattern = new LinkedList<Token>();
 
         Encoding enc = pattern.getEncoding();
@@ -249,6 +253,10 @@ public List<Token> compilePattern(ByteList pattern, boolean dateLibrary) {
             compiledPattern.add(new Token(Format.FORMAT_ENCODING, enc));
         }
 
+        if (format.isTaint()) {
+            compiledPattern.add(new Token(Format.FORMAT_TAINT));
+        }
+
         ByteArrayInputStream in = new ByteArrayInputStream(pattern.getUnsafeBytes(), pattern.getBegin(), pattern.getRealSize());
         Reader reader = new InputStreamReader(in);
         lexer.yyreset(reader);
@@ -348,13 +356,14 @@ static enum FieldType {
     }
 
     /** Convenience method when using no pattern caching */
-    public ByteList compileAndFormat(ByteList pattern, boolean dateLibrary, DateTime dt, long nsec, IRubyObject sub_millis) {
+    public RubyString compileAndFormat(RubyString pattern, boolean dateLibrary, DateTime dt, long nsec, IRubyObject sub_millis) {
         return format(compilePattern(pattern, dateLibrary), dt, nsec, sub_millis);
     }
 
-    public ByteList format(List<Token> compiledPattern, DateTime dt, long nsec, IRubyObject sub_millis) {
+    public RubyString format(List<Token> compiledPattern, DateTime dt, long nsec, IRubyObject sub_millis) {
         TimeOutputFormatter formatter = TimeOutputFormatter.DEFAULT_FORMATTER;
         ByteList toAppendTo = new ByteList();
+        boolean taint = false;
 
         for (Token token: compiledPattern) {
             String output = null;
@@ -366,6 +375,9 @@ public ByteList format(List<Token> compiledPattern, DateTime dt, long nsec, IRub
                 case FORMAT_ENCODING:
                     toAppendTo.setEncoding((Encoding) token.getData());
                     continue; // go to next token
+                case FORMAT_TAINT:
+                    taint = true;
+                    continue; // go to next token
                 case FORMAT_OUTPUT:
                     formatter = (TimeOutputFormatter) token.getData();
                     continue; // go to next token
@@ -542,7 +554,10 @@ public ByteList format(List<Token> compiledPattern, DateTime dt, long nsec, IRub
             }
         }
 
-        return toAppendTo;
+        RubyString str = context.runtime.newString(toAppendTo);
+        if (taint)
+            str.taint(context);
+        return str;
     }
 
     /**