[macruby-changes] [4924] MacRuby/trunk/string.c

[source_changes at macosforge.org]

Revision: 4924
          http://trac.macosforge.org/projects/ruby/changeset/4924
Author:   watson1978 at gmail.com
Date:     2010-11-21 06:41:39 -0800 (Sun, 21 Nov 2010)
Log Message:
-----------
String#crypt will copy the status of untrust.

Test Script:
{{{
require 'test/unit/assertions.rb'
include Test::Unit::Assertions

str = 'abcd'
str.taint
str.untrust

s = str.crypt("hello")
assert_equal(true, s.tainted?)
assert_equal(true, s.untrusted?)

tmp = "0123"
str.taint
str.untrust

s = str.crypt(tmp)
assert_equal(true, s.tainted?)
assert_equal(true, s.untrusted?)

puts :ok
}}}

Modified Paths:
--------------
    MacRuby/trunk/string.c

Modified: MacRuby/trunk/string.c
===================================================================
--- MacRuby/trunk/string.c	2010-11-21 14:25:19 UTC (rev 4923)
+++ MacRuby/trunk/string.c	2010-11-21 14:41:39 UTC (rev 4924)
@@ -5756,6 +5756,9 @@
     if (OBJ_TAINTED(str) || OBJ_TAINTED(salt)) {
 	OBJ_TAINT(crypted);
     }
+    if (OBJ_UNTRUSTED(str) || OBJ_UNTRUSTED(salt)) {
+	OBJ_UNTRUST(crypted);
+    }
     return crypted;
 }
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macruby-changes/attachments/20101121/15b21d41/attachment.html>