From 2afcbbaee075c56dc094502795cf034d27681ddc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=81lvaro=20Felipe=20Melchor?= <alvaro.felipe91@gmail.com>
Date: Mon, 30 Mar 2015 16:03:11 +0200
Subject: [PATCH] Fix #2188

---
 libr/anal/var.c    |  8 ++++++++
 libr/core/disasm.c | 15 ++++++++++++---
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/libr/anal/var.c b/libr/anal/var.c
index 38d1d2ab79..074e1e6971 100644
--- a/libr/anal/var.c
+++ b/libr/anal/var.c
@@ -282,8 +282,16 @@ R_API RList *r_anal_var_list(RAnal *a, RAnalFunction *fcn, int kind) {
 	return list;
 }
 
+static int var_comparator (const RAnalVar *a, const RAnalVar *b){
+	//avoid NULL dereference
+	if ( a && b)
+		return a->delta > b->delta;
+	return R_FALSE;
+}
+
 R_API void r_anal_var_list_show(RAnal *anal, RAnalFunction *fcn, int kind) {
 	RList *list = r_anal_var_list(anal, fcn, kind);
+	r_list_sort (list, var_comparator);
 	RAnalVar *var;
 	RListIter *iter;
 	r_list_foreach (list, iter, var) {
diff --git a/libr/core/disasm.c b/libr/core/disasm.c
index 44a04ab03c..4784532a36 100644
--- a/libr/core/disasm.c
+++ b/libr/core/disasm.c
@@ -731,6 +731,14 @@ static void handle_print_show_cursor (RCore *core, RDisasmState *ds) {
 	r_cons_printf (p&&q?"b*":p? "b ":q?"* ":"  ");
 }
 
+
+static int var_comparator (const RAnalVar *a, const RAnalVar *b){
+	//avoid NULL dereference
+	if ( a && b)
+		return a->delta > b->delta;
+	return R_FALSE;
+}
+
 static void handle_show_functions (RCore *core, RDisasmState *ds) {
 	RAnalFunction *f;
 	char *sign;
@@ -789,11 +797,12 @@ static void handle_show_functions (RCore *core, RDisasmState *ds) {
 		char spaces[32];
 		RList *args = r_anal_var_list (core->anal, f, 'a');
 		RList *vars = r_anal_var_list (core->anal, f, 'v');
-		r_list_join (vars, args);
+		r_list_sort (args, var_comparator);
+		r_list_sort (vars, var_comparator);
+		r_list_join (args, vars);
 		RAnalVar *var;
 		RListIter *iter;
-		// TODO: show first args, and then vars
-		r_list_foreach (vars, iter, var) {
+		r_list_foreach (args, iter, var) {
 			int idx;
 			memset (spaces, ' ', sizeof(spaces));
 			idx = 12-strlen (var->name);