浏览代码

drop DIR pointers again

Jeremy Soller 6 年之前
父节点
当前提交
fc9e3923f6
共有 1 个文件被更改,包括 4 次插入12 次删除
  1. 4 12
      src/header/dirent/mod.rs

+ 4 - 12
src/header/dirent/mod.rs

@@ -57,20 +57,12 @@ pub unsafe extern "C" fn opendir(path: *const c_char) -> *mut DIR {
 
 #[no_mangle]
 pub unsafe extern "C" fn closedir(dir: *mut DIR) -> c_int {
+    let mut dir = Box::from_raw(dir);
 
-    let ret = {
-        let mut dir = Box::from_raw(dir);
+    let ret = Sys::close(*dir.file);
 
-        let ret = Sys::close(*dir.file);
-
-        // Reference files aren't closed when dropped
-        dir.file.reference = true;
-
-        //TODO: find out why dropping dir can crash
-        mem::forget(dir);
-
-        ret
-    };
+    // Reference files aren't closed when dropped
+    dir.file.reference = true;
 
     ret
 }