RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-17 04:17:05 +00:00
Code Issues Projects Releases Wiki Activity

avfilter/vf_geq: fix multiple assignments of ptr in slice_geq_filter

Browse Source 
Fixes Coverity CID 1427183.

Signed-off-by: Marton Balint <cus@passwd.hu>
This commit is contained in:
Marton Balint 2019-12-28 15:05:43 +01:00
parent 04e524c34b
commit 47d5d0cc74
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavfilter/vf_geq.c
View File

@ -375,8 +375,6 @@ static int slice_geq_filter(AVFilterContext *ctx, void *arg, int jobnr, int nb_j
const int slice_start = (height * jobnr) / nb_jobs; const int slice_start = (height * jobnr) / nb_jobs;
const int slice_end = (height * (jobnr+1)) / nb_jobs; const int slice_end = (height * (jobnr+1)) / nb_jobs;
int x, y; int x, y;
uint8_t *ptr;
uint16_t *ptr16;
double values[VAR_VARS_NB]; double values[VAR_VARS_NB];
values[VAR_W] = geq->values[VAR_W]; values[VAR_W] = geq->values[VAR_W];
@ -387,8 +385,8 @@ static int slice_geq_filter(AVFilterContext *ctx, void *arg, int jobnr, int nb_j
values[VAR_T] = geq->values[VAR_T]; values[VAR_T] = geq->values[VAR_T];
if (geq->bps == 8) { if (geq->bps == 8) {
uint8_t *ptr = geq->dst + linesize * slice_start;
for (y = slice_start; y < slice_end; y++) { for (y = slice_start; y < slice_end; y++) {
ptr = geq->dst + linesize * y;
values[VAR_Y] = y; values[VAR_Y] = y;
for (x = 0; x < width; x++) { for (x = 0; x < width; x++) {
@ -397,15 +395,15 @@ static int slice_geq_filter(AVFilterContext *ctx, void *arg, int jobnr, int nb_j
} }
ptr += linesize; ptr += linesize;
} }
} } else {
else { uint16_t *ptr16 = geq->dst16 + (linesize/2) * slice_start;
for (y = slice_start; y < slice_end; y++) { for (y = slice_start; y < slice_end; y++) {
ptr16 = geq->dst16 + (linesize/2) * y;
values[VAR_Y] = y; values[VAR_Y] = y;
for (x = 0; x < width; x++) { for (x = 0; x < width; x++) {
values[VAR_X] = x; values[VAR_X] = x;
ptr16[x] = av_expr_eval(geq->e[plane], values, geq); ptr16[x] = av_expr_eval(geq->e[plane], values, geq);
} }
ptr16 += linesize/2;
} }
} }