2 files changed, 15 insertions, 2 deletions
diff --git a/spec/mspec/lib/mspec/helpers/tmp.rb b/spec/mspec/lib/mspec/helpers/tmp.rb
index 4c0eddab75..e903dd9f50 100644
--- a/spec/mspec/lib/mspec/helpers/tmp.rb
+++ b/spec/mspec/lib/mspec/helpers/tmp.rb
@@ -36,7 +36,20 @@ all specs are cleaning up temporary files:
 end
 
 def tmp(name, uniquify = true)
-  mkdir_p SPEC_TEMP_DIR unless Dir.exist? SPEC_TEMP_DIR
+  if Dir.exist? SPEC_TEMP_DIR
+    stat = File.stat(SPEC_TEMP_DIR)
+    if stat.world_writable? and !stat.sticky?
+      raise ArgumentError, "SPEC_TEMP_DIR (#{SPEC_TEMP_DIR}) is world writable but not sticky"
+    end
+  else
+    platform_is_not :windows do
+      umask = File.umask
+      if (umask & 0002) == 0 # o+w
+        raise ArgumentError, "File.umask #=> #{umask.to_s(8)} (world-writable)"
+      end
+    end
+    mkdir_p SPEC_TEMP_DIR
+  end
 
   if uniquify and !name.empty?
     slash = name.rindex "/"
diff --git a/spec/mspec/lib/mspec/runner/formatters/multi.rb b/spec/mspec/lib/mspec/runner/formatters/multi.rb
index a723ae8eb9..fa1da3766b 100644
--- a/spec/mspec/lib/mspec/runner/formatters/multi.rb
+++ b/spec/mspec/lib/mspec/runner/formatters/multi.rb
@@ -42,6 +42,6 @@ module MultiFormatter
   end
 
   def print_exception(exc, count)
-    print "\n#{count})\n#{exc}\n"
+    @err.print "\n#{count})\n#{exc}\n"
   end
 end