From cbddee1cca0ebd01e8c5aa694d31228eb4de4b41 Mon Sep 17 00:00:00 2001 From: Janne Grunau Date: Wed, 5 Mar 2014 12:44:57 +0100 Subject: arm: hpeldsp: prevent overreads in armv6 asm Based on a patch by Russel King Bug-Id: 646 CC: libav-stable@libav.org --- libavutil/arm/asm.S | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'libavutil/arm') diff --git a/libavutil/arm/asm.S b/libavutil/arm/asm.S index 45fdf55522..5884e172f3 100644 --- a/libavutil/arm/asm.S +++ b/libavutil/arm/asm.S @@ -216,6 +216,13 @@ T ldr \rt, [\rn] T add \rn, \rn, \rm .endm +.macro ldrc_pre cc, rt, rn, rm:vararg +A ldr\cc \rt, [\rn, \rm]! +T itt \cc +T add\cc \rn, \rn, \rm +T ldr\cc \rt, [\rn] +.endm + .macro ldrd_reg rt, rt2, rn, rm A ldrd \rt, \rt2, [\rn, \rm] T add \rt, \rn, \rm -- cgit v1.2.3