32 lines
862 B
Diff
32 lines
862 B
Diff
diff -ruN ruby-1.8.4.orig/dir.c ruby-1.8.4/dir.c
|
|
--- ruby-1.8.4.orig/dir.c 2005-09-14 22:40:58.000000000 +0900
|
|
+++ ruby-1.8.4/dir.c 2006-07-19 22:14:05.000000000 +0900
|
|
@@ -325,7 +325,17 @@
|
|
rb_raise(rb_eIOError, "closed directory");
|
|
}
|
|
|
|
+static void
|
|
+dir_check(dir)
|
|
+ VALUE dir;
|
|
+{
|
|
+ if (!OBJ_TAINTED(dir) && rb_safe_level() >= 4)
|
|
+ rb_raise(rb_eSecurityError, "Insecure: operation on untainted Dir");
|
|
+ rb_check_frozen(dir);
|
|
+}
|
|
+
|
|
#define GetDIR(obj, dirp) do {\
|
|
+ dir_check(dir);\
|
|
Data_Get_Struct(obj, struct dir_data, dirp);\
|
|
if (dirp->dir == NULL) dir_closed();\
|
|
} while (0)
|
|
@@ -536,6 +546,9 @@
|
|
{
|
|
struct dir_data *dirp;
|
|
|
|
+ if (rb_safe_level() >= 4 && !OBJ_TAINTED(dir)) {
|
|
+ rb_raise(rb_eSecurityError, "Insecure: can't close");
|
|
+ }
|
|
GetDIR(dir, dirp);
|
|
closedir(dirp->dir);
|
|
dirp->dir = NULL;
|