summaryrefslogtreecommitdiff
path: root/libavcodec/xpmdec.c
diff options
context:
space:
mode:
authorPaul B Mahol <onemda@gmail.com>2017-03-12 12:48:01 +0100
committerPaul B Mahol <onemda@gmail.com>2017-03-12 18:24:49 +0100
commiteda78c8b7f8a0e4728344f97700960f022eee6d2 (patch)
tree7f312d4abe6436259f9aa53f8cbcaa1ca600f6d3 /libavcodec/xpmdec.c
parent5dab7b91adf65eb35d4ae0e76fbd988d55b0d764 (diff)
downloadffmpeg-eda78c8b7f8a0e4728344f97700960f022eee6d2.tar.gz
avcodec/xpmdec: make convert function more picky about its input
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Diffstat (limited to 'libavcodec/xpmdec.c')
-rw-r--r--libavcodec/xpmdec.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/libavcodec/xpmdec.c b/libavcodec/xpmdec.c
index 3f01a8f002..8d5bc76ab2 100644
--- a/libavcodec/xpmdec.c
+++ b/libavcodec/xpmdec.c
@@ -185,15 +185,16 @@ static const ColorEntry color_table[] = {
{ "YellowGreen", 0xFF9ACD32 }
};
-static int convert(uint8_t x)
+static unsigned convert(uint8_t x)
{
- if (x >= 'a') {
+ if (x >= 'a' && x <= 'f')
x -= 87;
- } else if (x >= 'A') {
+ else if (x >= 'A' && x <= 'F')
x -= 55;
- } else {
+ else if (x >= '0' && x <= '9')
x -= '0';
- }
+ else
+ x = 0;
return x;
}