mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-10-20 15:13:26 +00:00
avcodec/xpmdec: Avoid unnecessary size_t->int conversion
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
parent
64634e809f
commit
357e339898
@ -233,14 +233,12 @@ static size_t mod_strcspn(const char *string, const char *reject)
|
|||||||
return i;
|
return i;
|
||||||
}
|
}
|
||||||
|
|
||||||
static uint32_t color_string_to_rgba(const char *p, int len)
|
static uint32_t color_string_to_rgba(const char *p, size_t len)
|
||||||
{
|
{
|
||||||
uint32_t ret = 0xFF000000;
|
uint32_t ret = 0xFF000000;
|
||||||
const ColorEntry *entry;
|
const ColorEntry *entry;
|
||||||
char color_name[100];
|
char color_name[100];
|
||||||
|
|
||||||
len = FFMIN(FFMAX(len, 0), sizeof(color_name) - 1);
|
|
||||||
|
|
||||||
if (*p == '#') {
|
if (*p == '#') {
|
||||||
p++;
|
p++;
|
||||||
len--;
|
len--;
|
||||||
@ -271,6 +269,7 @@ static uint32_t color_string_to_rgba(const char *p, int len)
|
|||||||
(hex_char_to_number(p[0]) << 28);
|
(hex_char_to_number(p[0]) << 28);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
len = FFMIN(len, sizeof(color_name) - 1);
|
||||||
strncpy(color_name, p, len);
|
strncpy(color_name, p, len);
|
||||||
color_name[len] = '\0';
|
color_name[len] = '\0';
|
||||||
|
|
||||||
@ -375,7 +374,7 @@ static int xpm_decode_frame(AVCodecContext *avctx, AVFrame *p,
|
|||||||
|
|
||||||
for (i = 0; i < ncolors; i++) {
|
for (i = 0; i < ncolors; i++) {
|
||||||
const uint8_t *index;
|
const uint8_t *index;
|
||||||
int len;
|
size_t len;
|
||||||
|
|
||||||
ptr += mod_strcspn(ptr, "\"") + 1;
|
ptr += mod_strcspn(ptr, "\"") + 1;
|
||||||
if (end - ptr < cpp)
|
if (end - ptr < cpp)
|
||||||
|
Loading…
Reference in New Issue
Block a user