portugalfuturista/rizin
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix #4098. (#5005)

Browse source 
The instructions were found correctly since the search refactor.
But the address of the hit was set to the second instruction.
This adds the tests discussed in the issue and sets the address
of the hit to the first instruction.
This commit is contained in:
Rot127 2025-03-17 08:31:53 +00:00 committed by GitHub
parent 9baa16fc8d
commit 2e9a082145
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 27 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
librz/core/casm.c
View file

@ -442,7 +442,7 @@ RZ_API RzList /*<RzCoreAsmHit *>*/ *rz_core_asm_strsearch(RzCore *core, const ch
RZ_FREE(hits);
goto beach;
}
hit->addr = addr;
hit->addr = tokcount == 1 ? addr : tidx;
hit->len = idx + len - tidx;
if (hit->len == -1) {
rz_core_asm_hit_free(hit);

26
test/db/cmd/cmd_search_a
View file

@ -97,3 +97,29 @@ EXPECT=<<EOF
EOF
RUN
NAME=/ad search - issue 4098
FILE==
ARGS=-e asm.arch=arm -e asm.bits=64
CMDS=<<EOF
wx a0e1fe9000003b9141b8fe9021400f91
pd 4
/ad "adrp x0;add x0"
/ad "adrp x1;add x1"
/ad "adrp x1;add x2"
/adj "adrp x0;add x0"
/adj "adrp x1;add x1"
/adj "adrp x1;add x2"
EOF
EXPECT=<<EOF
0x00000000 adrp x0, 0xfffffffffdc34000
0x00000004 add x0, x0, 0xec0
0x00000008 adrp x1, 0xfffffffffd708000
0x0000000c add x1, x1, 0x3d0
0x00000000 # 8: adrp x0, 0xfffffffffdc34000; add x0, x0, 0xec0
0x00000008 # 8: adrp x1, 0xfffffffffd708000; add x1, x1, 0x3d0
[{"offset":0,"len":8,"code":"adrp x0, 0xfffffffffdc34000; add x0, x0, 0xec0"}]
[{"offset":8,"len":8,"code":"adrp x1, 0xfffffffffd708000; add x1, x1, 0x3d0"}]
[]
EOF
RUN