Fix a bug in conversion of File into raw handle

Stjepan Glavina · Stjepan Glavina · commit 41f345d319c3 · 2019-09-08T19:19:34.000+02:00
diff --git a/src/fs/file.rs b/src/fs/file.rs
@@ -419,7 +419,11 @@ cfg_if! {
 
         impl IntoRawFd for File {
             fn into_raw_fd(self) -> RawFd {
-                self.file.as_raw_fd()
+                let file = self.file.clone();
+                drop(self);
+                Arc::try_unwrap(file)
+                    .expect("cannot acquire ownership of file handle after drop")
+                    .into_raw_fd()
             }
         }
     }
@@ -442,7 +446,11 @@ cfg_if! {
 
         impl IntoRawHandle for File {
             fn into_raw_handle(self) -> RawHandle {
-                self.file.as_raw_handle()
+                let file = self.file.clone();
+                drop(self);
+                Arc::try_unwrap(file)
+                    .expect("cannot acquire ownership of file's handle after drop")
+                    .into_raw_handle()
             }
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -419,7 +419,11 @@ cfg_if! {`
`419`	`419`
`420`	`420`	`impl IntoRawFd for File {`
`421`	`421`	`fn into_raw_fd(self) -> RawFd {`
`422`		`- self.file.as_raw_fd()`
	`422`	`+ let file = self.file.clone();`
	`423`	`+ drop(self);`
	`424`	`+ Arc::try_unwrap(file)`
	`425`	`+ .expect("cannot acquire ownership of file handle after drop")`
	`426`	`+ .into_raw_fd()`
`423`	`427`	`}`
`424`	`428`	`}`
`425`	`429`	`}`
`@@ -442,7 +446,11 @@ cfg_if! {`
`442`	`446`
`443`	`447`	`impl IntoRawHandle for File {`
`444`	`448`	`fn into_raw_handle(self) -> RawHandle {`
`445`		`- self.file.as_raw_handle()`
	`449`	`+ let file = self.file.clone();`
	`450`	`+ drop(self);`
	`451`	`+ Arc::try_unwrap(file)`
	`452`	`+ .expect("cannot acquire ownership of file's handle after drop")`
	`453`	`+ .into_raw_handle()`
`446`	`454`	`}`
`447`	`455`	`}`
`448`	`456`	`}`