Always free string pointers returned by libnitrokey

Old libnitrokey versions could return pointers to both statically and
dynamically allocated strings for functions that return strings.  This
has been fixed in libnitrokey commit 7a8550d (included in v3.4).  This
patch removes the old workaround and always frees the return value of
functions returning a string pointer.

1 files changed, 1 insertions, 2 deletions

diff --git a/src/util.rs b/src/util.rs
index d764baa..6f4fbb0 100644
--- a/src/util.rs
+++ b/src/util.rs
@@ -73,11 +73,10 @@ pub fn result_from_string(ptr: *const c_char) -> Result<String, CommandError> {
     }
     unsafe {
         let s = owned_str_from_ptr(ptr);
+        free(ptr as *mut c_void);
         if s.is_empty() {
             return Err(get_last_error());
         }
-        // TODO: move up for newer libnitrokey versions
-        free(ptr as *mut c_void);
         return Ok(s);
     }
 }