From 1b1c5f8f8661a01197a8a10af4471edb3a2a0373 Mon Sep 17 00:00:00 2001 From: zherczeg Date: Fri, 29 Nov 2019 11:03:10 +0000 Subject: [PATCH] Fix ARMv5 JIT improper handling of labels right after a constant pool. --- ChangeLog | 2 ++ src/sljit/sljitNativeARM_32.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/ChangeLog b/ChangeLog index a01fc51..739e9ba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,8 @@ Version 10.35 1. Use PCRE2_MATCH_EMPTY flag to detect empty matches in JIT. +2. Fix ARMv5 JIT improper handling of labels right after a constant pool. + Version 10.34 21-November-2019 ------------------------------ diff --git a/src/sljit/sljitNativeARM_32.c b/src/sljit/sljitNativeARM_32.c index 71f7bcd..8da0d09 100644 --- a/src/sljit/sljitNativeARM_32.c +++ b/src/sljit/sljitNativeARM_32.c @@ -666,6 +666,8 @@ SLJIT_API_FUNC_ATTRIBUTE void* sljit_generate_code(struct sljit_compiler *compil label->addr = (sljit_uw)SLJIT_ADD_EXEC_OFFSET(code_ptr, executable_offset); label->size = code_ptr - code; label = label->next; + + next_addr = compute_next_addr(label, jump, const_, put_label); } } }