[FFmpeg-devel] [PATCH] libavutil/hwcontext_amf: add format validation in transfer_data functions

[FFmpeg-devel] [PATCH] libavutil/hwcontext_amf: add format validation in transfer_data functions

[Dmitrii Ovchinnikov]

---
 libavutil/hwcontext_amf.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/libavutil/hwcontext_amf.c b/libavutil/hwcontext_amf.c
index b751a3c1ad..24731c20ec 100644
--- a/libavutil/hwcontext_amf.c
+++ b/libavutil/hwcontext_amf.c
@@ -277,6 +277,9 @@ static int amf_transfer_data_to(AVHWFramesContext *ctx, AVFrame *dst,
     int w = FFMIN(dst->width,  src->width);
     int h = FFMIN(dst->height, src->height);
 
+    if (dst->hw_frames_ctx->data != (uint8_t *)ctx || src->format != ctx->sw_format)
+        return AVERROR(EINVAL);
+
     if (!surface) {
         AVHWDeviceContext   *hwdev_ctx = ctx->device_ctx;
         AVAMFDeviceContext  *amf_device_ctx = (AVAMFDeviceContext *)hwdev_ctx->hwctx;
@@ -319,6 +322,9 @@ static int amf_transfer_data_from(AVHWFramesContext *ctx, AVFrame *dst,
     int h = FFMIN(dst->height, src->height);
     int ret;
 
+    if (src->hw_frames_ctx->data != (uint8_t *)ctx || dst->format != ctx->sw_format)
+        return AVERROR(EINVAL);
+
     ret = surface->pVtbl->Convert(surface, AMF_MEMORY_HOST);
     AMF_RETURN_IF_FALSE(ctx, ret == AMF_OK, AVERROR_UNKNOWN, "Convert(amf::AMF_MEMORY_HOST) failed with error %d\n", AVERROR_UNKNOWN);
 
-- 
2.47.1.windows.1

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".