Fix null deref, memleaks and portability regression

radareorg · Jun 26, 2024 · c13ede0 · c13ede0
1 parent 2be3f7e
commit c13ede0
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/libr/cons/hud.c b/libr/cons/hud.c
@@ -490,6 +490,7 @@ static char *r_cons_message_multiline(const char *msg) {
 	r_cons_any_key (NULL);
 	r_list_free (lines);
 	free (s);
+	free (newmsg);
 	return NULL;
 }
 

diff --git a/libr/core/panels.c b/libr/core/panels.c
@@ -5159,15 +5159,15 @@ static void __add_menu(RCore *core, const char *parent, const char *name, RPanel
 	}
 	if (p_item == NULL) {
 		R_LOG_WARN ("Cannot find panel %s", parent);
-		sleep (1);
+		r_sys_sleep (1);
 	}
 	item->n_sub = 0;
 	item->selectedIndex = 0;
 	item->name = name ? r_str_new (name) : NULL;
 	item->sub = NULL;
 	item->cb = cb;
 	item->p = R_NEW0 (RPanel);
-	if (item->p) {
+	if (item->p && p_item) {
 		item->p->model = R_NEW0 (RPanelModel);
 		item->p->view = R_NEW0 (RPanelView);
 		if (item->p->model && item->p->view) {

diff --git a/libr/util/token.c b/libr/util/token.c
@@ -300,7 +300,7 @@ bool callback(RTokenizer *tok) {
 		switch (tok->ch) {
 		case '}':
 			R_FREE (data->s);
-			// pj_end (data->pj);
+			pj_end (data->pj);
 			pj_end (data->pj);
 			break;
 		}
@@ -337,7 +337,7 @@ bool callback(RTokenizer *tok) {
 					pj_end (data->pj);
 					if (first) {
 						first = false;
-						pj_ka (data->pj, "blocks");
+						pj_ka (data->pj, "body");
 					}
 				}
 			}
@@ -354,7 +354,7 @@ bool callback(RTokenizer *tok) {
 				R_FREE (data->s);
 			}
 			// pj_ka (data->pj, "body");
-			pj_a (data->pj);
+			//pj_a (data->pj);
 		} else if (tok->ch == '(') {
 			data->parlevel++;
 			if (data->word) {

diff --git a/test/db/tools/token b/test/db/tools/token
@@ -55,7 +55,7 @@ EXPECT=<<EOF
       }
     ],
     "body": [
-      {
+      "args": {
         "type": "call",
         "name": "puts",
         "args": [