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

avcodec/xpmdec: Avoid unnecessary size_t->int conversion 

Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt 2024-03-05 22:41:57 +01:00
parent 64634e809f
commit 357e339898
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/xpmdec.c
View File

@ -233,14 +233,12 @@ static size_t mod_strcspn(const char *string, const char *reject)
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;
const ColorEntry *entry;
char color_name[100];
len = FFMIN(FFMAX(len, 0), sizeof(color_name) - 1);
if (*p == '#') {
p++;
len--;
@ -271,6 +269,7 @@ static uint32_t color_string_to_rgba(const char *p, int len)
(hex_char_to_number(p[0]) << 28);
}
} else {
len = FFMIN(len, sizeof(color_name) - 1);
strncpy(color_name, p, len);
color_name[len] = '\0';
@ -375,7 +374,7 @@ static int xpm_decode_frame(AVCodecContext *avctx, AVFrame *p,
for (i = 0; i < ncolors; i++) {
const uint8_t *index;
int len;
size_t len;
ptr += mod_strcspn(ptr, "\"") + 1;
if (end - ptr < cpp)