Magic-Mirror/radare2
1
0
Fork 0
mirror of https://github.com/radareorg/radare2.git synced 2025-02-10 16:23:08 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Fix Xtensa RStrBuf (#11606)

Browse Source
This commit is contained in:
Anton Kochkov 2018-09-21 19:55:40 +08:00 committed by GitHub
parent 7579c57bdc
commit b56c4862eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
libr/asm/p/asm_xtensa.c
View File

@ -14,7 +14,7 @@
#define INSN_BUFFER_SIZE 4
static ut64 offset = 0;
static char *buf_global = NULL;
static RStrBuf *buf_global = NULL;
static ut8 bytes[INSN_BUFFER_SIZE];
static int xtensa_buffer_read_memory (bfd_vma memaddr, bfd_byte *myaddr, ut32 length, struct disassemble_info *info) {
@ -39,34 +39,25 @@ static void print_address(bfd_vma address, struct disassemble_info *info) {
return;
}
sprintf (tmp, "0x%08"PFMT64x"", (ut64)address);
strcat (buf_global, tmp);
r_strbuf_append (buf_global, tmp);
}
static int buf_fprintf(void *stream, const char *format, ...) {
va_list ap;
char tmp[1024];
if (!buf_global) {
return 0;
}
va_start (ap, format);
int flen = strlen (format);
int glen = strlen (buf_global);
char *tmp = malloc (flen + glen + 2);
if (!tmp) {
return 0;
}
memcpy (tmp, buf_global, glen);
memcpy (tmp+glen, format, flen);
tmp[flen + glen] = 0;
// XXX: overflow here?
vsprintf (buf_global, tmp, ap);
vsprintf (tmp, format, ap);
r_strbuf_append (buf_global, tmp);
va_end (ap);
free (tmp);
return 0;
}
static int disassemble(RAsm *a, RAsmOp *op, const ut8 *buf, int len) {
struct disassemble_info disasm_obj;
buf_global = r_strbuf_get (&op->buf_asm);
buf_global = &op->buf_asm;
offset = a->pc;
if (len > INSN_BUFFER_SIZE) {
len = INSN_BUFFER_SIZE;