From 9e39c618da89cda4819b62f14f82348372f32d63 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 9 Sep 2010 22:29:16 +0000
Subject: * ext/etc/etc.c (etc_systmpdir): assume system default tmpdir   safe.
  [ruby-dev:42089]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@29209 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ext/etc/etc.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'ext/etc')

diff --git a/ext/etc/etc.c b/ext/etc/etc.c
index 0a01acf47d..9f2b4590b6 100644
--- a/ext/etc/etc.c
+++ b/ext/etc/etc.c
@@ -584,14 +584,17 @@ etc_sysconfdir(VALUE obj)
 static VALUE
 etc_systmpdir(void)
 {
+    VALUE tmpdir;
 #ifdef _WIN32
     WCHAR path[_MAX_PATH];
     UINT len = rb_w32_system_tmpdir(path, numberof(path));
     if (!len) return Qnil;
-    return rb_w32_conv_from_wchar(path, rb_filesystem_encoding());
+    tmpdir = rb_w32_conv_from_wchar(path, rb_filesystem_encoding());
 #else
-    return rb_filesystem_str_new_cstr("/tmp");
+    tmpdir = rb_filesystem_str_new_cstr("/tmp");
 #endif
+    FL_UNSET(tmpdir, FL_TAINT|FL_UNTRUSTED);
+    return tmpdir;
 }
 
 /*
-- 
cgit v1.2.3