Fix remaining segfault in RCons.canvas, still trashy output

Author: radare

Makefile

@@ -23,9 +23,9 @@ MAKE_JOBS?=1
 
 all: plugins.cfg
 	${MAKE} -C libr/util
-	${MAKE} -j$(MAKE_JOBS) -C shlr
-	${MAKE} -j$(MAKE_JOBS) -C libr
-	${MAKE} -j$(MAKE_JOBS) -C binr
+	${MAKE} -C shlr
+	${MAKE} -C libr
+	${MAKE} -C binr
 
 plugins.cfg:
 	@if [ ! -e config-user.mk ]; then echo ; \

libr/cons/canvas.c

@@ -233,14 +233,20 @@ R_API void r_cons_canvas_line (RConsCanvas *c, int x, int y, int x2, int y2, int
 						memset (row+1, '-', w-2);
 					row[w-1] = '\'';
 					row[w] = 0;
-					onscreen = G (x2,y+hl+1);
+					onscreen = G (x2+w,y+hl+1);
+					i = G (x2, y+hl+1);
+					if (!onscreen)
+						onscreen = i;
 				} else {
 					row[0] = '`';
 					if (w>1)
 						memset (row+1, '-', w-1);
 					row[w] = '.';
 					row[w+1] = 0;
-					onscreen = G (x,y+1+hl);
+					onscreen = G (x+w,y+1+hl);
+					i = G (x,y+1+hl);
+					if (!onscreen)
+						onscreen = i;
 				}
 				if (onscreen)
 					W (row);
@@ -279,20 +285,23 @@ R_API void r_cons_canvas_line (RConsCanvas *c, int x, int y, int x2, int y2, int
 					W (row);
 
 				w = rl2;
+				free (row);
+				row = malloc (rl2+1);
 				if (x>x2) {
 					row[0] = '`';
 					memset (row+1, '-', w-2);
 					row[w-1] = '\'';
 					row[w] = 0;
-					G (x2+rl, y+1);
+					onscreen = G (x2+rl, y+1);
 				} else {
 					row[0] = '.';
 					memset (row+1, '-', w-2);
 					row[w-1] = '.';
 					row[w] = 0;
-					G (x+rl, y2-1);
+					onscreen = G (x+rl, y2-1);
 				}
-				W (row);
+				if (onscreen)
+					W (row);
 				free (row);
 			}
 			}

libr/core/graph.c

@@ -106,7 +106,6 @@ static int Node_find(const Node* nodes, ut64 addr) {
 	return -1;
 }
 
-
 static void Layout_depth2(Node *nodes, Edge *edges, int nth, int depth) {
 	int j, f;
 	if (!nodes || !nodes[nth].text)
@@ -189,7 +188,6 @@ R_API int r_core_visual_graph(RCore *core, RAnalFunction *_fcn) {
 	can = r_cons_canvas_new (w-1, h-1);
 
 	nodes = malloc (sizeof(Node)*(r_list_length (fcn->bbs)+1));
-	edges = NULL;
 	i = 0;
 	r_list_foreach (fcn->bbs, iter, bb) {
 		nodes[i].text = r_core_cmd_strf (core,
@@ -206,17 +204,18 @@ R_API int r_core_visual_graph(RCore *core, RAnalFunction *_fcn) {
 	n_nodes = i;
 
 	i = 0;
+	edges = NULL;
 	n_edges = 0;
 	r_list_foreach (fcn->bbs, iter, bb) {
 		// add edge from bb->addr to bb->jump / bb->fail
 		if (bb->jump != UT64_MAX) {
-			edges = realloc(edges, sizeof (Edge)*(i+1));
+			edges = realloc (edges, sizeof (Edge)*(i+2));
 			edges[i].nth = 0;
 			edges[i].from = Node_find (nodes, bb->addr);
 			edges[i].to = Node_find (nodes, bb->jump);
 			i++;
 			if (bb->fail != UT64_MAX) {
-				edges = realloc(edges, sizeof (Edge)*(i+1));
+				edges = realloc (edges, sizeof (Edge)*(i+2));
 				edges[i].nth = 1;
 				edges[i].from = Node_find (nodes, bb->addr);
 				edges[i].to = Node_find (nodes, bb->fail);
@@ -296,6 +295,10 @@ prevnode = curnode;
 	case 's': can->sy += 1; break;
 	case 'a': can->sx -= 1; break;
 	case 'd': can->sx += 1; break;
+	case 'W': can->sy -= 5; break;
+	case 'S': can->sy += 5; break;
+	case 'A': can->sx -= 5; break;
+	case 'D': can->sx += 5; break;
 		break;
 	case 'u':
 		curnode = prevnode;

libr/stripsyms.sh

@@ -1,5 +1,8 @@
 #!/bin/sh
 
+# skip this thing. it slow downs the build too much
+exit 0
+
 [ -n "${NOSTRIP}" ] && exit 0
 
 [ -z "$2" ] && exit 0