rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix segfault if pthread_getattr_np fails

Browse Source 
glibc destroys[1] the passed pthread_attr_t if pthread_getattr_np()
fails.  Destroying it again leads to a segfault.  Fix it by only
destroying it on success for glibc.

[1]: https://sourceware.org/git/?p=glibc.git;a=blob;f=nptl/pthread_getattr_np.c;h=ce437205e41dc05653e435f6188768cccdd91c99;hb=HEAD#l205
This commit is contained in:
Tavian Barnes
2020-09-09 10:16:03 -04:00
parent 683d1bcd40
commit a06edda3ad
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
library/std/src/sys/unix/thread.rs
View File

@@ -305,7 +305,9 @@ pub mod guard {
assert_eq!(libc::pthread_attr_getstack(&attr, &mut stackaddr, &mut stacksize), 0); assert_eq!(libc::pthread_attr_getstack(&attr, &mut stackaddr, &mut stacksize), 0);
ret = Some(stackaddr); ret = Some(stackaddr);
} }
assert_eq!(libc::pthread_attr_destroy(&mut attr), 0); if e == 0 || cfg!(not(target_env = "gnu")) {
assert_eq!(libc::pthread_attr_destroy(&mut attr), 0);
}
ret ret
} }
@@ -446,7 +448,9 @@ pub mod guard {
Some(stackaddr..stackaddr + guardsize) Some(stackaddr..stackaddr + guardsize)
}; };
} }
assert_eq!(libc::pthread_attr_destroy(&mut attr), 0); if e == 0 || cfg!(not(target_env = "gnu")) {
assert_eq!(libc::pthread_attr_destroy(&mut attr), 0);
}
ret ret
} }
} }