Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2024-11-24 22:00:18 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

* Added search.count

Browse Source 
* Check null pointer before r_list_foreach
This commit is contained in:
pancake 2011-05-20 22:42:11 +02:00
parent d7adf6e790
commit f36b18aa3e
5 changed files with 31 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
libr/core/cmd.c
View File

@ -3192,9 +3192,16 @@ static int cmd_resize(void *data, const char *input) {
static const char *cmdhit = NULL;
static const char *searchprefix = NULL;
static int searchcount = 0;
static int __cb_hit(RSearchKeyword *kw, void *user, ut64 addr) {
RCore *core = (RCore *)user;
if (searchcount) {
if (!--searchcount) {
eprintf ("search.count reached\n");
return R_FALSE;
}
}
r_cons_printf ("f %s%d_%d %d 0x%08"PFMT64x"\n", searchprefix,
kw->kwidx, kw->count, kw->keyword_length, addr);
if (!strnull (cmdhit)) {
@ -3281,7 +3288,7 @@ static int cmd_search(void *data, const char *input) {
r_search_kw_add (core->search,
r_search_keyword_new ((const ut8*)&n32, 4, NULL, 0, NULL));
r_search_begin (core->search);
dosearch = 1;
dosearch = R_TRUE;
break;
case 'w': /* search wide string */
if (input[1]==' ') {
@ -3298,7 +3305,7 @@ static int cmd_search(void *data, const char *input) {
r_search_kw_add (core->search,
r_search_keyword_new ((const ut8*)str, len*2, NULL, 0, NULL));
r_search_begin (core->search);
dosearch = 1;
dosearch = R_TRUE;
}
break;
case ' ': /* search string */
@ -3314,7 +3321,7 @@ static int cmd_search(void *data, const char *input) {
r_search_keyword_new ((const ut8*)inp, len, NULL, 0, NULL));
//r_search_keyword_new_str (, "", NULL));
r_search_begin (core->search);
dosearch = 1;
dosearch = R_TRUE;
break;
case 'e': /* match regexp */
{
@ -3331,9 +3338,9 @@ static int cmd_search(void *data, const char *input) {
r_search_kw_add (core->search,
r_search_keyword_new_str (inp, opt, NULL));
r_search_begin (core->search);
dosearch = 1;
free(inp);
free(opt);
dosearch = R_TRUE;
free (inp);
free (opt);
}
break;
case 'x': /* search hex */
@ -3343,7 +3350,7 @@ static int cmd_search(void *data, const char *input) {
r_search_kw_add (core->search,
r_search_keyword_new_hexmask (input+2, NULL));
r_search_begin (core->search);
dosearch = 1;
dosearch = R_TRUE;
break;
case 'c': /* search asm */
{
@ -3374,7 +3381,7 @@ static int cmd_search(void *data, const char *input) {
r_search_keyword_new_hexmask (kwd, NULL));
r_search_begin (core->search);
free (kwd);
dosearch = 1;
dosearch = R_TRUE;
}
}
break;
@ -3403,6 +3410,9 @@ static int cmd_search(void *data, const char *input) {
break;
}
if (dosearch) {
searchcount = r_config_get_i (core->config, "search.count");
if (searchcount)
searchcount++;
if (core->search->n_kws>0 || aes_search) {
RSearchKeyword aeskw;
if (aes_search) {
@ -3427,7 +3437,9 @@ static int cmd_search(void *data, const char *input) {
if (aes_search) {
int delta = r_search_aes_update (core->search, at, buf, ret);
if (delta != -1) {
r_search_hit_new (core->search, &aeskw, at+delta);
if (!r_search_hit_new (core->search, &aeskw, at+delta)) {
break;
}
aeskw.count++;
}
} else

1
libr/core/config.c
View File

@ -409,6 +409,7 @@ R_API int r_core_config_init(RCore *core) {
r_config_set (cfg, "scr.fkey", "function");
r_config_set (cfg, "scr.seek", "");
r_config_set_i_cb (cfg, "scr.cols", 16, &config_scrcols_callback);
r_config_set_i (cfg, "search.count", 0);
r_config_set (cfg, "search.prefix", "hit");
r_config_set_i (cfg, "search.from", 0);
r_config_set_i (cfg, "search.to", 0);

4
libr/include/r_list.h
View File

@ -28,9 +28,9 @@ typedef struct r_oflist_t {
#ifdef R_API
#define r_list_foreach(list, it, pos) \
for (it = list->head; it && (pos = it->data); it = it->n)
if (list) for (it = list->head; it && (pos = it->data); it = it->n)
#define r_list_foreach_prev(list, it, pos) \
for (it = list->tail; it && (pos = it->data); it = it->p)
if(list) for (it = list->tail; it && (pos = it->data); it = it->p)
#define r_list_iterator(x) (x)?(x)->head:NULL
#define r_list_empty(x) (x==NULL || (x->head==NULL && x->tail==NULL))
#define r_list_head(x) x->head

5
libr/lang/p/getlangs.sh
View File

@ -1,7 +1,10 @@
#!/bin/sh
e=$1
#LANGS="python perl tcc lua ruby vala"
LANGS=$(cat ../../../supported.langs | grep -e perl -e ruby -e python -e lua)
l="../../../supported.langs"
[ ! -f $l ] && exit 0
LANGS=$(cat $l | grep -e perl -e ruby -e python -e lua)
# check tcc
echo "main(){}" > a.c

5
libr/search/search.c
View File

@ -137,8 +137,9 @@ R_API int r_search_mybinparse_update(void *_s, ut64 from, const ut8 *buf, int le
if (hit) {
kw->idx[j]++;
if (kw->idx[j] == kw->keyword_length) {
r_search_hit_new (s, kw, (ut64)
from+i-kw->keyword_length+1);
if (!r_search_hit_new (s, kw, (ut64)
from+i-kw->keyword_length+1))
return -1;
kw->idx[j] = 0;
//kw->idx[0] = 0;
kw->distance = 0;