Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2025-01-20 20:55:32 +00:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Fix #3479 - Search fails in some situations

Browse Source
This commit is contained in:
pancake 2015-10-18 18:31:28 +02:00
parent d2d79b1fdf
commit ef30bba14a
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libr/search/search.c
View File

@ -272,15 +272,15 @@ R_API int r_search_mybinparse_update(void *_s, ut64 from, const ut8 *buf, int le
//eprintf ("nhits = %d\n", s->nhits);
return -1;
}
for (j=0; j<=kw->distance; j++) {
for (j=0; j <= kw->distance; j++) {
/* TODO: refactor: hit = checkKeyword() */
// TODO: assert len(kw) == len(bm)
if (kw->binmask_length != 0) {
// CHECK THE WHOLE MASKED HEXPAIR HERE
if (kw->binmask_length < (len-i)) {
if (maskHits (buf+i, len-i, kw)) {
i += kw->keyword_length-1;
kw->idx[j] = kw->keyword_length-1;
i += kw->keyword_length - 1;
kw->idx[j] = kw->keyword_length - 1;
kw->distance = 0;
hit = true;
} else {
@ -299,7 +299,7 @@ R_API int r_search_mybinparse_update(void *_s, ut64 from, const ut8 *buf, int le
if (ch != ch2) {
if (s->inverse) {
if (!r_search_hit_new (s, kw, (ut64)
from+i-kw->keyword_length+1))
from + i - kw->keyword_length + 1))
return -1;
kw->idx[j] = 0;
//kw->idx[0] = 0;
@ -314,7 +314,7 @@ R_API int r_search_mybinparse_update(void *_s, ut64 from, const ut8 *buf, int le
kw->distance++;
hit = true;
} else {
kw->idx[0] = 0;
// kw->idx[0] = 0;
kw->distance = 0;
hit = false;
}