Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2025-02-18 21:28:15 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Stop aeg from abusing agg ##refactor

Browse Source
This commit is contained in:
condret 2022-10-20 01:27:49 +02:00
parent 38c0c394a5
commit 6fd27ce229
10 changed files with 131 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libr/anal/class.c
View File

@ -2,9 +2,7 @@
#include <r_anal.h>
#include <r_vector.h>
#include <r_util/r_graph_drawable.h>
#include "../include/r_anal.h"
#include "../include/r_util/r_graph.h"
#include <r_util.h>
static void r_anal_class_base_delete_class(RAnal *anal, const char *class_name);
static void r_anal_class_method_delete_class(RAnal *anal, const char *class_name);

22
libr/core/agraph.c
View File

@ -1,7 +1,7 @@
/* Copyright radare2 - 2014-2022 - pancake, ret2libc */
#include <r_core.h>
#include <r_util/r_graph_drawable.h>
#include <r_util.h>
static R_TH_LOCAL int mousemode = 0;
static R_TH_LOCAL int disMode = 0;
@ -3750,7 +3750,8 @@ R_API RANode *r_agraph_add_node(const RAGraph *g, const char *title, const char
}
res->title = title? r_str_trunc_ellipsis (title, 255) : strdup ("");
res->body = body? strdup (body): strdup ("");
res->body = (body && strlen (body))? r_str_endswith (body, "\n")?
strdup (body): r_str_newf ("%s\n", body): strdup (""); //XXX
res->layer = -1;
res->pos_in_layer = -1;
res->is_dummy = false;
@ -5032,14 +5033,8 @@ R_API int r_core_visual_graph(RCore *core, RAGraph *g, RAnalFunction *_fcn, int
return !is_error;
}
/**
* @brief Create RAGraph from generic RGraph with RGraphNodeInfo as node data
*
* @param graph <RGraphNodeInfo>
* @return RAGraph* NULL if failure
*/
R_API RAGraph *create_agraph_from_graph(const RGraph/*<RGraphNodeInfo>*/ *graph) {
r_return_val_if_fail (graph, NULL);
R_API RAGraph *r_agraph_new_from_graph(const RGraph *graph, RAGraphTransitionCBs *cbs) {
r_return_val_if_fail (graph && cbs && cbs->get_title && cbs->get_body, NULL);
RAGraph *result_agraph = r_agraph_new (r_cons_canvas_new (1, 1));
if (!result_agraph) {
@ -5059,8 +5054,11 @@ R_API RAGraph *create_agraph_from_graph(const RGraph/*<RGraphNodeInfo>*/ *graph)
RGraphNode *node;
// Traverse the list, create new ANode for each Node
r_list_foreach (graph->nodes, iter, node) {
RGraphNodeInfo *info = node->data;
RANode *a_node = r_agraph_add_node (result_agraph, info->title, info->body, NULL);
char *title = cbs->get_title (node->data);
char *body = cbs->get_body (node->data);
RANode *a_node = r_agraph_add_node (result_agraph, title, body, NULL);
R_FREE (title);
R_FREE (body);
if (!a_node) {
goto failure;
}

2
libr/core/canal.c
View File

@ -7,7 +7,7 @@
#include <r_core.h>
#include <r_bin.h>
#include <ht_uu.h>
#include <r_util/r_graph_drawable.h>
#include <r_util.h>
HEAPTYPE (ut64);

169
libr/core/cmd_anal.c
View File

@ -1,7 +1,7 @@
/* radare - LGPL - Copyright 2009-2022 - pancake, maijin */
#include <r_core.h>
#include <r_util/r_graph_drawable.h>
#include <r_util.h>
#define SLOW_ANALYSIS 1
#define MAX_SCAN_SIZE 0x7ffffff
@ -464,11 +464,10 @@ static const char *help_msg_aeC[] = {
};
static const char *help_msg_aeg[] = {
"Usage:", "aeg[cfiv*]", " [...]",
"Usage:", "aeg[fiv]", " [...]",
"aeg", "", "analyze current instruction as an esil graph",
"aegf", "", "analyze given expression and filter for register",
"aeg*", "", "analyze current instruction as an esil graph",
"aegv", "", "analyse and launch the visual interactive mode (.aeg*;aggv == aegv)",
"aegv", "", "analyse and launch the visual interactive mode",
NULL
};
@ -7021,90 +7020,96 @@ static void __anal_esil_function(RCore *core, ut64 addr) {
#endif
}
static void print_esil_dfg_as_commands(RCore *core, RAnalEsilDFG *dfg) {
RListIter *iter, *ator;
RGraphNode *node, *edon;
RStrBuf *sb = r_strbuf_new ("");
if (!sb) {
return;
}
r_cons_println ("ag-");
r_list_foreach (r_graph_get_nodes (dfg->flow), iter, node) {
const RAnalEsilDFGNode *enode = (RAnalEsilDFGNode *)node->data;
char *esc_str = r_str_escape (r_strbuf_get (enode->content));
if (!esc_str) {
r_strbuf_free (sb);
return;
}
r_strbuf_set (sb, esc_str);
if (enode->type & R_ANAL_ESIL_DFG_TAG_GENERATIVE) {
r_strbuf_prepend (sb, "generative:");
}
char *b64_buf = r_base64_encode_dyn (r_strbuf_get (sb), sb->len);
if (!b64_buf) {
r_strbuf_free (sb);
free (esc_str);
return;
}
static char *_aeg_get_title (void *data) {
RAnalEsilDFGNode *enode = (RAnalEsilDFGNode *)data;
return r_str_newf ("%d", enode->idx);
}
r_cons_printf ("agn %d base64:%s\n", enode->idx, b64_buf);
free (b64_buf);
free (esc_str);
}
r_strbuf_free (sb);
r_list_foreach (r_graph_get_nodes (dfg->flow), iter, node) {
const RAnalEsilDFGNode *enode = (RAnalEsilDFGNode *)node->data;
r_list_foreach (r_graph_get_neighbours (dfg->flow, node), ator, edon) {
const RAnalEsilDFGNode *edone = (RAnalEsilDFGNode *)edon->data;
r_cons_printf ("age %d %d\n", enode->idx, edone->idx);
}
}
static char *_aeg_get_body (void *data) {
RAnalEsilDFGNode *enode = (RAnalEsilDFGNode *)data;
return r_str_newf ("%s%s",
(enode->type & R_ANAL_ESIL_DFG_TAG_GENERATIVE)? "generative:": "",
r_strbuf_get (enode->content));
}
static void cmd_aeg(RCore *core, int argc, char *argv[]) {
r_return_if_fail (core && argc >= 0 && argv);
RAGraphTransitionCBs cbs = {
.get_title = _aeg_get_title,
.get_body = _aeg_get_body
};
switch (argv[0][1]) {
case '\x00': // "aeg"
if (argc == 1) {
r_core_cmd0 (core, ".aeg*;agg");
} else {
RAnalEsilDFG *dfg = r_anal_esil_dfg_expr (core->anal, NULL, argv[1]);
r_return_if_fail (dfg);
print_esil_dfg_as_commands (core, dfg);
r_anal_esil_dfg_free (dfg);
}
break;
case '*': // "aeg*"
{
RAnalOp *aop = r_core_anal_op (core, core->offset, R_ARCH_OP_MASK_ESIL);
if (!aop) {
return;
}
const char *esilstr = r_strbuf_get (&aop->esil);
if (R_STR_ISNOTEMPTY (esilstr)) {
RAnalEsilDFG *dfg = r_anal_esil_dfg_expr (core->anal, NULL, esilstr);
if (!dfg) {
{
if (argc == 1) {
RAnalOp *aop = r_core_anal_op (core, core->offset, R_ARCH_OP_MASK_ESIL);
if (!aop) {
return;
}
const char *esilstr = r_strbuf_get (&aop->esil);
if (R_STR_ISNOTEMPTY (esilstr)) {
RAnalEsilDFG *dfg = r_anal_esil_dfg_expr (core->anal, NULL, esilstr);
if (!dfg) {
r_anal_op_free (aop);
return;
}
RAGraph *agraph = r_agraph_new_from_graph (dfg->flow, &cbs);
r_anal_esil_dfg_free (dfg);
agraph->can->linemode = r_config_get_i (core->config, "graph.linemode");
r_agraph_print (agraph);
r_agraph_free (agraph);
}
r_anal_op_free (aop);
return;
} else {
RAnalEsilDFG *dfg = r_anal_esil_dfg_expr (core->anal, NULL, argv[1]);
r_return_if_fail (dfg);
RAGraph *agraph = r_agraph_new_from_graph (dfg->flow, &cbs);
r_anal_esil_dfg_free (dfg);
agraph->can->linemode = r_config_get_i (core->config, "graph.linemode");
r_agraph_print (agraph);
r_agraph_free (agraph);
}
print_esil_dfg_as_commands (core, dfg);
r_anal_esil_dfg_free (dfg);
}
r_anal_op_free (aop);
}
break;
case 'i': // "aegi"
case 'v': // "aegv"
{
RConfigHold *hc = r_config_hold_new (core->config);
if (!hc) {
return;
RAGraph *agraph = NULL;
if (argc == 1) {
RAnalOp *aop = r_core_anal_op (core, core->offset, R_ARCH_OP_MASK_ESIL);
if (!aop) {
return;
}
const char *esilstr = r_strbuf_get (&aop->esil);
if (R_STR_ISNOTEMPTY (esilstr)) {
RAnalEsilDFG *dfg = r_anal_esil_dfg_expr (core->anal, NULL, esilstr);
if (!dfg) {
r_anal_op_free (aop);
return;
}
agraph = r_agraph_new_from_graph (dfg->flow, &cbs);
r_anal_esil_dfg_free (dfg);
}
r_anal_op_free (aop);
} else {
RAnalEsilDFG *dfg = r_anal_esil_dfg_expr (core->anal, NULL, argv[1]);
r_return_if_fail (dfg);
agraph = r_agraph_new_from_graph (dfg->flow, &cbs);
r_anal_esil_dfg_free (dfg);
}
r_config_hold (hc, "cmd.gprompt", NULL);
r_config_set (core->config, "cmd.gprompt", "pi 1");
r_core_cmd0 (core, ".aeg*;aggv");
r_config_hold_free (hc);
const ut64 osc = r_config_get_i (core->config, "scr.color");
r_config_set_i (core->config, "scr.color", 0);
ut64 oseek = core->offset;
// bool ov = r_cons_is_interactive ();
agraph->need_update_dim = true;
int update_seek = r_core_visual_graph (core, agraph, NULL, true);
r_cons_show_cursor (true);
r_cons_enable_mouse (false);
if (update_seek != -1) {
r_core_seek (core, oseek, false);
}
r_agraph_free (agraph);
r_config_set_i (core->config, "scr.color", osc);
}
break;
case 'f': // "aegf"
@ -7116,6 +7121,7 @@ static void cmd_aeg(RCore *core, int argc, char *argv[]) {
}
}
break;
#if 0
case 'c': // "aegc"
{
RAnalEsilDFG *dfg = r_anal_esil_dfg_expr (core->anal, NULL, argv[1]);
@ -7135,6 +7141,7 @@ static void cmd_aeg(RCore *core, int argc, char *argv[]) {
r_anal_esil_dfg_free (dfg);
}
break;
#endif
case '?': // "aeg?"
default:
r_core_cmd_help (core, help_msg_aeg);
@ -10345,6 +10352,16 @@ static char *print_graph_dot(RCore *core, RGraph /*<RGraphNodeInfo>*/ *graph) {
return result;
}
static char *_graph_node_info_get_title(void *data) {
RGraphNodeInfo *info = (RGraphNodeInfo *)data;
return (info && info->title)? strdup (info->title): NULL;
}
static char *_graph_node_info_get_body(void *data) {
RGraphNodeInfo *info = (RGraphNodeInfo *)data;
return (info && info->body)? strdup (info->body): NULL;
}
static void r_core_graph_print(RCore *core, RGraph /*<RGraphNodeInfo>*/ *graph, int use_utf, bool use_offset, const char *input) {
RAGraph *agraph = NULL;
RListIter *it;
@ -10360,7 +10377,11 @@ static void r_core_graph_print(RCore *core, RGraph /*<RGraphNodeInfo>*/ *graph,
case 'k':
case 'v':
case 'i': {
agraph = create_agraph_from_graph (graph);
RAGraphTransitionCBs cbs = {
.get_title = _graph_node_info_get_title,
.get_body = _graph_node_info_get_body
};
agraph = r_agraph_new_from_graph (graph, &cbs);
switch (*input) {
case 0:
agraph->can->linemode = r_config_get_i (core->config, "graph.linemode");

7
libr/include/r_agraph.h
View File

@ -96,6 +96,11 @@ typedef struct r_ascii_graph_t {
RAGraphHits ghits;
} RAGraph;
typedef struct r_ascii_graph_transition_callbacks_t {
char *(*get_title)(void *data);
char *(*get_body)(void *data);
} RAGraphTransitionCBs;
#ifdef R_API
R_API RAGraph *r_agraph_new(RConsCanvas *can);
R_API void r_agraph_free(RAGraph *g);
@ -114,7 +119,7 @@ R_API Sdb *r_agraph_get_sdb(RAGraph *g);
R_API void r_agraph_foreach(RAGraph *g, RANodeCallback cb, void *user);
R_API void r_agraph_foreach_edge(RAGraph *g, RAEdgeCallback cb, void *user);
R_API void r_agraph_set_curnode(RAGraph *g, RANode *node);
R_API RAGraph *create_agraph_from_graph(const RGraph/*<RGraphNodeInfo>*/ *graph);
R_API RAGraph *r_agraph_new_from_graph(const RGraph *graph, RAGraphTransitionCBs *cbs);
#endif
#ifdef __cplusplus

1
libr/include/r_util.h
View File

@ -72,6 +72,7 @@ int gettimeofday (struct timeval* p, void* tz);
#include "r_util/r_idpool.h"
#include "r_util/r_asn1.h"
#include "r_util/pj.h"
#include "r_util/r_graph_drawable.h"
#include "r_util/bplist.h"
#include "r_util/r_x509.h"
#include "r_util/r_pkcs7.h"

2
libr/include/r_util/r_graph_drawable.h
View File

@ -2,7 +2,7 @@
#define R2_GRAPH_DRAWABLE_H
#include <r_types.h>
#include <r_util/r_graph.h>
#include <r_util.h>
#include <r_config.h>
#ifdef __cplusplus

2
libr/util/graph_drawable.c
View File

@ -1,7 +1,7 @@
/* radare - LGPL - Copyright 2007-2020 - pancake, ret2libc */
#include <r_core.h>
#include <r_util/r_graph_drawable.h>
#include <r_util.h>
R_API void r_graph_free_node_info(void *ptr) {
if (ptr) {

16
test/unit/test_agraph.c
View File

@ -4,6 +4,16 @@
#include <r_util.h>
#include "minunit.h"
static char *_graph_node_info_get_title(void *data) {
RGraphNodeInfo *info = (RGraphNodeInfo *)data;
return (info && info->title)? strdup (info->title): NULL;
}
static char *_graph_node_info_get_body(void *data) {
RGraphNodeInfo *info = (RGraphNodeInfo *)data;
return (info && info->body)? strdup (info->body): NULL;
}
bool test_graph_to_agraph() {
RCore *core = r_core_new ();
r_core_cmd0 (core, "ac A");
@ -19,7 +29,11 @@ bool test_graph_to_agraph() {
mu_assert_notnull (graph, "Couldn't create the graph");
mu_assert_eq (graph->nodes->length, 4, "Wrong node count");
RAGraph *agraph = create_agraph_from_graph (graph);
RAGraphTransitionCBs cbs = {
.get_title = _graph_node_info_get_title,
.get_body = _graph_node_info_get_body
};
RAGraph *agraph = r_agraph_new_from_graph (graph, &cbs);
mu_assert_notnull (agraph, "Couldn't create the graph");
mu_assert_eq (agraph->graph->nodes->length, 4, "Wrong node count");

1
test/unit/test_anal_class_graph.c
View File

@ -1,7 +1,6 @@
#include <r_core.h>
#include <r_anal.h>
#include <r_util.h>
#include <r_util/r_graph_drawable.h>
#include "minunit.h"
bool test_inherit_graph_creation() {