From: Jouni Malinen <j@w1.fi>
Date: Tue, 14 May 2013 13:46:38 +0000 (+0300)
Subject: edit: Fix libreadline history clearing with WPA_TRACE
X-Git-Tag: aosp-kk-from-upstream~262
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0af2db74787394465edb9ae011e52c2bce33d1c0;p=thirdparty%2Fhostap.git

edit: Fix libreadline history clearing with WPA_TRACE

The HIST_ENTRY and its variables are allocated within libreadline, so
they won't have the WPA_TRACE special header and cannot be freed with
os_free(). Use free() to avoid issues during wpa_cli termination if any
of the new commands added to the history are to be removed (e.g.,
set_network could include a password).

Signed-hostap: Jouni Malinen <j@w1.fi>
---

diff --git a/src/utils/edit_readline.c b/src/utils/edit_readline.c
index add26fa33..c2a5bcaa1 100644
--- a/src/utils/edit_readline.c
+++ b/src/utils/edit_readline.c
@@ -167,9 +167,9 @@ void edit_deinit(const char *history_file,
 			if (filter_cb && filter_cb(edit_cb_ctx, p)) {
 				h = remove_history(where_history());
 				if (h) {
-					os_free(h->line);
+					free(h->line);
 					free(h->data);
-					os_free(h);
+					free(h);
 				} else
 					next_history();
 			} else