From 82b1a12f356e828acc7d4824f316f16d77d6ae83 Mon Sep 17 00:00:00 2001
From: Steven Fackler <sfackler@gmail.com>
Date: Tue, 25 Jul 2017 20:32:04 -0700
Subject: [PATCH] Abort on bad unlock and safe core dumps

---
 circle.yml                 | 9 +++++++++
 openssl-sys/src/ossl10x.rs | 6 +++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/circle.yml b/circle.yml
index a78c4c97..bc868ac4 100644
--- a/circle.yml
+++ b/circle.yml
@@ -27,6 +27,7 @@ job: &JOB
       export OPENSSL_DIR=$HOME/openssl
       cargo run --manifest-path=systest/Cargo.toml --target $TARGET
   - run: |
+      ulimit -c unlimited
       export OPENSSL_DIR=$HOME/openssl
       export PATH=$OPENSSL_DIR/bin:$PATH
       if [ "${NO_RUN}" = "1" ]; then
@@ -37,6 +38,14 @@ job: &JOB
         --target $TARGET \
         --all-features \
         $TEST_ARGS
+  - run:
+      command: |
+        mkdir -p /tmp/core_dumps
+        find . -name "core.*" -exec cp \{\} /tmp/core_dumps \;
+        cp target/$TARGET/debug/openssl-* /tmp/core_dumps
+      when: on_fail
+  - store_artifacts:
+      path: /tmp/core_dumps
   - save_cache:
       key: deps-1.19.0-{{ checksum "Cargo.lock" }}-{{ checksum "~/lib_key" }}
       paths:
diff --git a/openssl-sys/src/ossl10x.rs b/openssl-sys/src/ossl10x.rs
index a0fdb396..771dc528 100644
--- a/openssl-sys/src/ossl10x.rs
+++ b/openssl-sys/src/ossl10x.rs
@@ -2,6 +2,7 @@ use std::sync::{Mutex, MutexGuard};
 use std::sync::{Once, ONCE_INIT};
 use std::mem;
 use std::ptr;
+use std::process;
 
 use libc::{c_int, c_char, c_void, c_long, c_uchar, size_t, c_uint, c_ulong};
 #[cfg(not(ossl101))]
@@ -746,7 +747,10 @@ unsafe extern "C" fn locking_function(mode: c_int, n: c_int, _file: *const c_cha
     if mode & ::CRYPTO_LOCK != 0 {
         (*GUARDS)[n as usize] = Some(mutex.lock().unwrap());
     } else {
-        &(*GUARDS)[n as usize].take().expect("lock already unlocked");
+        if let None = &(*GUARDS)[n as usize].take() {
+            println!("lock {} already unlocked", n);
+            process::abort();
+        }
     }
 }