avcodec/xpmdec: make convert function more picky about its input

Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2017-03-12 12:48:01 +01:00
parent 5dab7b91ad
commit eda78c8b7f
1 changed files with 6 additions and 5 deletions

View File

@ -185,15 +185,16 @@ static const ColorEntry color_table[] = {
{ "YellowGreen", 0xFF9ACD32 } { "YellowGreen", 0xFF9ACD32 }
}; };
static int convert(uint8_t x) static unsigned convert(uint8_t x)
{ {
if (x >= 'a') { if (x >= 'a' && x <= 'f')
x -= 87; x -= 87;
} else if (x >= 'A') { else if (x >= 'A' && x <= 'F')
x -= 55; x -= 55;
} else { else if (x >= '0' && x <= '9')
x -= '0'; x -= '0';
} else
x = 0;
return x; return x;
} }