Auto merge of #65228 - Wind-River:real_master, r=dtolnay

vxworks: add checking (r == 0)
rust-lang · Oct 9, 2019 · 20cc752 · 20cc752
2 parents 321ccbe + 175db95
commit 20cc752
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/libstd/sys/vxworks/rwlock.rs b/src/libstd/sys/vxworks/rwlock.rs
@@ -25,7 +25,7 @@ impl RWLock {
         let r = libc::pthread_rwlock_rdlock(self.inner.get());
         if r == libc::EAGAIN {
             panic!("rwlock maximum reader count exceeded");
-        } else if r == libc::EDEADLK || *self.write_locked.get() {
+        } else if r == libc::EDEADLK || (r == 0 && *self.write_locked.get()) {
             if r == 0 {
                 self.raw_unlock();
             }