Virtualization
/
capstone
mirror of https://gitlab.com/qemu-project/capstone.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

arch/M68k: do not return reg_name if beyond limits (#1219) 

* arch/M68k: do not return reg_name if beyond limits

(patch coming from radare2)

* arch: checks index when returning reg names
This commit is contained in:
Riccardo Schirone 2018-07-24 10:25:47 +02:00 committed by Nguyen Anh Quynh
parent 223ba56531
commit 6ed076d41e
11 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/AArch64/AArch64Mapping.c
View File

@ -283,7 +283,7 @@ static name_map reg_name_maps[] = {
const char *AArch64_reg_name(csh handle, unsigned int reg)
{
#ifndef CAPSTONE_DIET
if (reg >= ARM64_REG_ENDING)
if (reg >= ARR_SIZE(reg_name_maps))
return NULL;
return reg_name_maps[reg].name;

4
arch/ARM/ARMMapping.c
View File

@ -245,7 +245,7 @@ static name_map reg_name_maps2[] = {
const char *ARM_reg_name(csh handle, unsigned int reg)
{
#ifndef CAPSTONE_DIET
if (reg >= ARM_REG_ENDING)
if (reg >= ARR_SIZE(reg_name_maps))
return NULL;
return reg_name_maps[reg].name;
@ -257,7 +257,7 @@ const char *ARM_reg_name(csh handle, unsigned int reg)
const char *ARM_reg_name2(csh handle, unsigned int reg)
{
#ifndef CAPSTONE_DIET
if (reg >= ARM_REG_ENDING)
if (reg >= ARR_SIZE(reg_name_maps2))
return NULL;
return reg_name_maps2[reg].name;

2
arch/M680X/M680XInstPrinter.c
View File

@ -299,7 +299,7 @@ const char *M680X_reg_name(csh handle, unsigned int reg)
{
#ifndef CAPSTONE_DIET
if (reg >= M680X_REG_ENDING)
if (reg >= ARR_SIZE(s_reg_names))
return NULL;
return s_reg_names[(int)reg];

3
arch/M68K/M68KInstPrinter.c
View File

@ -338,6 +338,9 @@ const char* M68K_reg_name(csh handle, unsigned int reg)
#ifdef CAPSTONE_DIET
return NULL;
#else
if (reg >= ARR_SIZE(s_reg_names)) {
return NULL;
}
return s_reg_names[(int)reg];
#endif
}

2
arch/Mips/MipsMapping.c
View File

@ -201,7 +201,7 @@ static name_map reg_name_maps[] = {
const char *Mips_reg_name(csh handle, unsigned int reg)
{
#ifndef CAPSTONE_DIET
if (reg >= MIPS_REG_ENDING)
if (reg >= ARR_SIZE(reg_name_maps))
return NULL;
return reg_name_maps[reg].name;

2
arch/PowerPC/PPCMapping.c
View File

@ -234,7 +234,7 @@ static name_map reg_name_maps[] = {
const char *PPC_reg_name(csh handle, unsigned int reg)
{
#ifndef CAPSTONE_DIET
if (reg >= PPC_REG_ENDING)
if (reg >= ARR_SIZE(reg_name_maps))
return NULL;
return reg_name_maps[reg].name;

2
arch/Sparc/SparcMapping.c
View File

@ -112,7 +112,7 @@ static name_map reg_name_maps[] = {
const char *Sparc_reg_name(csh handle, unsigned int reg)
{
#ifndef CAPSTONE_DIET
if (reg >= SPARC_REG_ENDING)
if (reg >= ARR_SIZE(reg_name_maps))
return NULL;
return reg_name_maps[reg].name;

2
arch/SystemZ/SystemZMapping.c
View File

@ -57,7 +57,7 @@ static name_map reg_name_maps[] = {
const char *SystemZ_reg_name(csh handle, unsigned int reg)
{
#ifndef CAPSTONE_DIET
if (reg >= SYSZ_REG_ENDING)
if (reg >= ARR_SIZE(reg_name_maps))
return NULL;
return reg_name_maps[reg].name;

2
arch/TMS320C64x/TMS320C64xMapping.c
View File

@ -110,7 +110,7 @@ static name_map reg_name_maps[] = {
const char *TMS320C64x_reg_name(csh handle, unsigned int reg)
{
#ifndef CAPSTONE_DIET
if (reg >= TMS320C64X_REG_ENDING)
if (reg >= ARR_SIZE(reg_name_maps))
return NULL;
return reg_name_maps[reg].name;

2
arch/X86/X86Mapping.c
View File

@ -828,7 +828,7 @@ const char *X86_reg_name(csh handle, unsigned int reg)
#ifndef CAPSTONE_DIET
cs_struct *ud = (cs_struct *)handle;
if (reg >= X86_REG_ENDING)
if (reg >= ARR_SIZE(reg_name_maps))
return NULL;
if (reg == X86_REG_EFLAGS) {

2
arch/XCore/XCoreMapping.c
View File

@ -49,7 +49,7 @@ static name_map reg_name_maps[] = {
const char *XCore_reg_name(csh handle, unsigned int reg)
{
#ifndef CAPSTONE_DIET
if (reg >= XCORE_REG_ENDING)
if (reg >= ARR_SIZE(reg_name_maps))
return NULL;
return reg_name_maps[reg].name;