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

avcodec/xpmdec: define constants

This commit is contained in:
Paul B Mahol 2018-12-10 21:38:08 +01:00
parent 00502370f6
commit 03beac5b97
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavcodec/xpmdec.c
View File

@ -26,6 +26,10 @@
#include "avcodec.h"
#include "internal.h"
#define MIN_ELEMENT ' '
#define MAX_ELEMENT 0xfe
#define NB_ELEMENTS (MAX_ELEMENT - MIN_ELEMENT + 1)
typedef struct XPMContext {
uint32_t *pixels;
int pixels_size;
@ -290,10 +294,10 @@ static int ascii2index(const uint8_t *cpixel, int cpp)
int n = 0, m = 1, i;
for (i = 0; i < cpp; i++) {
if (*p < ' ' || *p > 0xfe)
if (*p < MIN_ELEMENT || *p > MAX_ELEMENT)
return AVERROR_INVALIDDATA;
n += (*p++ - ' ') * m;
m *= 223;
n += (*p++ - MIN_ELEMENT) * m;
m *= NB_ELEMENTS;
}
return n;
}
@ -346,7 +350,7 @@ static int xpm_decode_frame(AVCodecContext *avctx, void *data,
size = 1;
for (i = 0; i < cpp; i++)
size *= 223;
size *= NB_ELEMENTS;
if (ncolors <= 0 || ncolors > size) {
av_log(avctx, AV_LOG_ERROR, "invalid number of colors: %d\n", ncolors);