Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2024-11-27 15:10:53 +00:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Fix underflow access in capstone tms320c64x disassembler

Browse Source
This commit is contained in:
pancake 2017-04-18 01:21:47 +02:00
parent 16c73edfa5
commit 985e164d1c
1 changed files with 67 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

67
shlr/capstone-patches/fix-underflow-tms.patch Normal file
View File

@ -0,0 +1,67 @@
diff --git a/arch/TMS320C64x/TMS320C64xInstPrinter.c b/arch/TMS320C64x/TMS320C64xInstPrinter.c
index fa57893..d6e9896 100644
--- a/arch/TMS320C64x/TMS320C64xInstPrinter.c
+++ b/arch/TMS320C64x/TMS320C64xInstPrinter.c
@@ -70,15 +70,14 @@ void TMS320C64x_post_printer(csh ud, cs_insn *insn, char *insn_asm, MCInst *mci)
if((p != NULL) && (((p2 = strchr(p, '[')) != NULL) || ((p2 = strchr(p, '(')) != NULL))) {
while((p2 > p) && ((*p2 != 'A') && (*p2 != 'B')))
p2--;
- if(p2 == p) {
- strcpy(insn_asm, "Invalid!");
- return;
- } else {
- if(*p2 == 'A')
- strcpy(tmp, "1T");
- else
- strcpy(tmp, "2T");
- }
+ if(p2 <= p) {
+ strcpy(insn_asm, "Invalid!");
+ return;
+ }
+ if(*p2 == 'A')
+ strcpy(tmp, "1T");
+ else
+ strcpy(tmp, "2T");
} else {
tmp[0] = '\0';
}
diff --git a/arch/X86/X86ATTInstPrinter.c b/arch/X86/X86ATTInstPrinter.c
index f408668..f442881 100644
--- a/arch/X86/X86ATTInstPrinter.c
+++ b/arch/X86/X86ATTInstPrinter.c
@@ -604,6 +604,10 @@ static void printPCRelImm(MCInst *MI, unsigned OpNo, SStream *O)
if (MI->Opcode == X86_CALLpcrel16 || MI->Opcode == X86_JMP_2)
imm = imm & 0xffff;
+ if (MI->csh->mode == CS_MODE_16) {
+ imm |= (MI->address >> 16) << 16;
+ }
+
if (imm < 0) {
SStream_concat(O, "0x%"PRIx64, imm);
} else {
diff --git a/arch/X86/X86IntelInstPrinter.c b/arch/X86/X86IntelInstPrinter.c
index d7c6d29..83745b9 100644
--- a/arch/X86/X86IntelInstPrinter.c
+++ b/arch/X86/X86IntelInstPrinter.c
@@ -733,7 +733,7 @@ void X86_Intel_printInst(MCInst *MI, SStream *O, void *Info)
reg = X86_insn_reg_intel(MCInst_getOpcode(MI), &access1);
if (MI->csh->detail) {
#ifndef CAPSTONE_DIET
- uint8_t access[6];
+ uint8_t access[6] = {0};
#endif
// first op can be embedded in the asm by llvm.
@@ -799,6 +799,10 @@ static void printPCRelImm(MCInst *MI, unsigned OpNo, SStream *O)
if (MI->Opcode == X86_CALLpcrel16 || MI->Opcode == X86_JMP_2)
imm = imm & 0xffff;
+ if (MI->csh->mode == CS_MODE_16) {
+ imm |= (MI->address >> 16) << 16;
+ }
+
printImm(MI->csh->syntax, O, imm, true);
if (MI->csh->detail) {