virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

h264: add overread protection to get_cabac_bypass_sign_x86().

Browse Source
This commit is contained in:
Ronald S. Bultje
2012-03-17 08:58:48 -07:00
parent 95bfa4ead7
commit a0bdcb019e
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/x86/cabac.h
View File

@@ -105,7 +105,7 @@ static av_always_inline int get_cabac_bypass_sign_x86(CABACContext *c, int val)
{ {
x86_reg tmp; x86_reg tmp;
__asm__ volatile( __asm__ volatile(
"movl %a5(%2), %k1 \n\t" "movl %a6(%2), %k1 \n\t"
"movl %a3(%2), %%eax \n\t" "movl %a3(%2), %%eax \n\t"
"shl $17, %k1 \n\t" "shl $17, %k1 \n\t"
"add %%eax, %%eax \n\t" "add %%eax, %%eax \n\t"
@@ -122,9 +122,10 @@ static av_always_inline int get_cabac_bypass_sign_x86(CABACContext *c, int val)
"movzwl (%1), %%edx \n\t" "movzwl (%1), %%edx \n\t"
"bswap %%edx \n\t" "bswap %%edx \n\t"
"shrl $15, %%edx \n\t" "shrl $15, %%edx \n\t"
"add $2, %1 \n\t"
"addl %%edx, %%eax \n\t" "addl %%edx, %%eax \n\t"
"mov %1, %a4(%2) \n\t" "cmp %a5(%2), %1 \n\t"
"jge 1f \n\t"
"add"OPSIZE" $2, %a4(%2) \n\t"
"1: \n\t" "1: \n\t"
"movl %%eax, %a3(%2) \n\t" "movl %%eax, %a3(%2) \n\t"
@@ -132,6 +133,7 @@ static av_always_inline int get_cabac_bypass_sign_x86(CABACContext *c, int val)
: "r"(c), : "r"(c),
"i"(offsetof(CABACContext, low)), "i"(offsetof(CABACContext, low)),
"i"(offsetof(CABACContext, bytestream)), "i"(offsetof(CABACContext, bytestream)),
"i"(offsetof(CABACContext, bytestream_end)),
"i"(offsetof(CABACContext, range)) "i"(offsetof(CABACContext, range))
: "%eax", "%edx", "memory" : "%eax", "%edx", "memory"
); );