Permalink
Browse files

Fix radare#12417/radare#12418 attempts.

  • Loading branch information...
devnexen committed Dec 10, 2018
1 parent 2ebd956 commit 88a8adf080a9f8ed5a4250a2507752e133ba54dd
Showing with 2 additions and 2 deletions.
  1. +1 −1 libr/asm/arch/arm/armass.c
  2. +1 −1 libr/asm/arch/arm/armass64.c
@@ -6545,7 +6545,7 @@ ut32 armass_assemble(const char *str, ut64 off, int thumb) {
int i, j;
char buf[128];
ArmOpcode aop = {.off = off};
for (i = j = 0; i < sizeof (buf) - 1 && str[i]; i++, j++) {
for (i = j = 0; i < sizeof (buf) - 1 && str[j]; i++, j++) {
if (str[j] == '#') {
i--; continue;
}
@@ -756,7 +756,7 @@ static bool parseOperands(char* str, ArmOp *op) {
} else if (!strncmp (token, "asr", 3)) {
op->operands[operand].shift = ARM_ASR;
}
if (op->operands[operand].shift != ARM_NO_SHIFT) {
if (strlen(token) > 4 && op->operands[operand].shift != ARM_NO_SHIFT) {
op->operands_count ++;
op->operands[operand].shift_amount = r_num_math (NULL, token + 4);
if (op->operands[operand].shift_amount > 63) {

0 comments on commit 88a8adf

Please sign in to comment.