diff --git a/src/tools.c b/src/tools.c
index 82e1063..1c43354 100644
--- a/src/tools.c
+++ b/src/tools.c
@@ -2464,10 +2464,8 @@
 
 bad_input:
 	memprintf(err, "an hex digit is expected (found '%c')", p[i-1]);
-	if (alloc) {
-		free(*binstr);
-		*binstr = NULL;
-	}
+	if (alloc)
+		ha_free(binstr);
 	return 0;
 }
 
@@ -3957,8 +3955,7 @@
 
 	if (needed < 0) {
 		/* an error was encountered */
-		free(ret);
-		ret = NULL;
+		ha_free(&ret);
 	}
 
 	if (out) {