Commit 3aec0a38 authored by Steven Fackler's avatar Steven Fackler Committed by GitHub
Browse files

Merge pull request #601 from pgerber/double_unlock 

Panic if lock managed by `locking_function` is doubly unlocked
parents bf63f35d f82f6509

openssl-sys/src/libressl.rs

+1 −1
Original line number Diff line number Diff line
@@ -576,7 +576,7 @@ unsafe extern fn locking_function(mode: c_int, n: c_int, _file: *const c_char, 
    if mode & ::CRYPTO_LOCK != 0 {

        (*GUARDS)[n as usize] = Some(mutex.lock().unwrap());

    } else {

        &(*GUARDS)[n as usize].take();

        &(*GUARDS)[n as usize].take().expect("lock already unlocked");

    }

}

openssl-sys/src/ossl10x.rs

+1 −1
Original line number Diff line number Diff line
@@ -719,7 +719,7 @@ unsafe extern fn locking_function(mode: c_int, n: c_int, _file: *const c_char, 
    if mode & ::CRYPTO_LOCK != 0 {

        (*GUARDS)[n as usize] = Some(mutex.lock().unwrap());

    } else {

        &(*GUARDS)[n as usize].take();

        &(*GUARDS)[n as usize].take().expect("lock already unlocked");

    }

}