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

avutil/common: Protect GET_BYTE in GET_UTF8() by ()

Browse Source 
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer
2016-01-13 02:33:48 +01:00
parent 115fb6d03e
commit 9ca64c31d2
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavutil/common.h
View File

@@ -356,13 +356,13 @@ static av_always_inline av_const int av_parity_c(uint32_t v)
* to prevent undefined results. * to prevent undefined results.
*/ */
#define GET_UTF8(val, GET_BYTE, ERROR)\ #define GET_UTF8(val, GET_BYTE, ERROR)\
val= GET_BYTE;\ val= (GET_BYTE);\
{\ {\
uint32_t top = (val & 128) >> 1;\ uint32_t top = (val & 128) >> 1;\
if ((val & 0xc0) == 0x80 || val >= 0xFE)\ if ((val & 0xc0) == 0x80 || val >= 0xFE)\
ERROR\ ERROR\
while (val & top) {\ while (val & top) {\
int tmp= GET_BYTE - 128;\ int tmp= (GET_BYTE) - 128;\
if(tmp>>6)\ if(tmp>>6)\
ERROR\ ERROR\
val= (val<<6) + tmp;\ val= (val<<6) + tmp;\