From 6221e2478c593a0ce1183eed929cb2101dbf5265 Mon Sep 17 00:00:00 2001 From: Mans Rullgard Date: Sat, 6 Oct 2012 10:21:22 +0100 Subject: [PATCH] parseutils: fix parsing of invalid alpha values An alpha specifier outside the valid range results in a conversion from double to long with undefined result. Range-checking the double and only converting it after it passes avoids this. Fixes fate-parseutils errors on some systems. Signed-off-by: Mans Rullgard --- libavutil/parseutils.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavutil/parseutils.c b/libavutil/parseutils.c index 0ca179ea80..d3f08b72ed 100644 --- a/libavutil/parseutils.c +++ b/libavutil/parseutils.c @@ -355,7 +355,7 @@ int av_parse_color(uint8_t *rgba_color, const char *color_string, int slen, } if (tail) { - unsigned long int alpha; + double alpha; const char *alpha_string = tail; if (!strncmp(alpha_string, "0x", 2)) { alpha = strtoul(alpha_string, &tail, 16); @@ -363,7 +363,7 @@ int av_parse_color(uint8_t *rgba_color, const char *color_string, int slen, alpha = 255 * strtod(alpha_string, &tail); } - if (tail == alpha_string || *tail || alpha > 255) { + if (tail == alpha_string || *tail || alpha > 255 || alpha < 0) { av_log(log_ctx, AV_LOG_ERROR, "Invalid alpha value specifier '%s' in '%s'\n", alpha_string, color_string); return AVERROR(EINVAL);