From 9d151adc7cb19831ea844d98fc13af27b790e369 Mon Sep 17 00:00:00 2001
From: lloyd <lloyd@randombit.net>
Date: Sun, 8 Mar 2015 21:23:28 +0000
Subject: Cleanups

---
 src/lib/ffi/ffi.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/lib/ffi')

diff --git a/src/lib/ffi/ffi.cpp b/src/lib/ffi/ffi.cpp
index c5a862200..eba3f5f94 100644
--- a/src/lib/ffi/ffi.cpp
+++ b/src/lib/ffi/ffi.cpp
@@ -786,6 +786,8 @@ int botan_privkey_load(botan_privkey_t* key, botan_rng_t rng_obj,
                        const uint8_t bits[], size_t len,
                        const char* password)
    {
+   *key = nullptr;
+
    try
       {
       Botan::DataSource_Memory src(bits, len);
@@ -810,8 +812,6 @@ int botan_privkey_load(botan_privkey_t* key, botan_rng_t rng_obj,
       }
 
    return -1;
-   *key = nullptr;
-   return BOTAN_FFI_ERROR_EXCEPTION_THROWN;
    }
 
 int botan_privkey_destroy(botan_privkey_t key)
-- 
cgit v1.2.3