RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

parseutils: reliably detect out-of-range alpha. 

This should fix the FATE test on ARM (not tested),
but it should also detect alpha values like 2^128
reliably as invalid which would be another out-of-range
case with implementation-dependant behaviour.

Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
This commit is contained in:
Reimar Döffinger 2012-04-24 20:18:57 +02:00
parent 44bd2f90a9
commit 2b336df3cb
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavutil/parseutils.c
View File

@ -394,7 +394,11 @@ int av_parse_color(uint8_t *rgba_color, const char *color_string, int slen,
if (!strncmp(alpha_string, "0x", 2)) {
alpha = strtoul(alpha_string, &tail, 16);
} else {
alpha = 255 * strtod(alpha_string, &tail);
double norm_alpha = strtod(alpha_string, &tail);
if (norm_alpha < 0.0 || norm_alpha > 1.0)
alpha = 256;
else
alpha = 255 * norm_alpha;
}
if (tail == alpha_string || *tail || alpha > 255) {