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

avutil/hwcontext_d3d11va: fix texture_infos writes on non-fixed-size pools

Browse Source
This commit is contained in:
Timo Rothenpieler 2022-07-06 01:32:27 +02:00
parent e18c575474
commit 30bbc0a624
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libavutil/hwcontext_d3d11va.c
View File

@ -166,6 +166,17 @@ static AVBufferRef *wrap_texture_buf(AVHWFramesContext *ctx, ID3D11Texture2D *te
return NULL; return NULL;
} }
if (s->nb_surfaces <= s->nb_surfaces_used) {
frames_hwctx->texture_infos = av_realloc_f(frames_hwctx->texture_infos,
s->nb_surfaces_used + 1,
sizeof(*frames_hwctx->texture_infos));
if (!frames_hwctx->texture_infos) {
ID3D11Texture2D_Release(tex);
return NULL;
}
s->nb_surfaces = s->nb_surfaces_used + 1;
}
frames_hwctx->texture_infos[s->nb_surfaces_used].texture = tex; frames_hwctx->texture_infos[s->nb_surfaces_used].texture = tex;
frames_hwctx->texture_infos[s->nb_surfaces_used].index = index; frames_hwctx->texture_infos[s->nb_surfaces_used].index = index;
s->nb_surfaces_used++; s->nb_surfaces_used++;
@ -284,7 +295,7 @@ static int d3d11va_frames_init(AVHWFramesContext *ctx)
} }
} }
hwctx->texture_infos = av_calloc(ctx->initial_pool_size, sizeof(*hwctx->texture_infos)); hwctx->texture_infos = av_realloc_f(NULL, ctx->initial_pool_size, sizeof(*hwctx->texture_infos));
if (!hwctx->texture_infos) if (!hwctx->texture_infos)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
s->nb_surfaces = ctx->initial_pool_size; s->nb_surfaces = ctx->initial_pool_size;