diff mbox series

[FFmpeg-devel,1/3] lavfi/dnn/dnn_io_proc.c: Fix Out-of-bounds access (ARRAY_VS_SINGLETON)

Message ID 20210511074112.18552-1-yejun.guo@intel.com
State Accepted
Commit bd6ea9ed1d7110601a83722b94c5a2d66feb511d
Headers show
Series [FFmpeg-devel,1/3] lavfi/dnn/dnn_io_proc.c: Fix Out-of-bounds access (ARRAY_VS_SINGLETON) | expand

Checks

Context Check Description
andriy/x86_make success Make finished
andriy/x86_make_fate fail Make fate failed
andriy/PPC64_make success Make finished
andriy/PPC64_make_fate warning Make fate failed

Commit Message

Guo, Yejun May 11, 2021, 7:41 a.m. UTC 
fix coverity CID 1473571, 1473577 and 1482089
---
 libavfilter/dnn/dnn_io_proc.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
diff mbox series

Patch

diff --git a/libavfilter/dnn/dnn_io_proc.c b/libavfilter/dnn/dnn_io_proc.c
index 1e2bef3f9a..d5d2654162 100644
--- a/libavfilter/dnn/dnn_io_proc.c
+++ b/libavfilter/dnn/dnn_io_proc.c
@@ -154,7 +154,7 @@  static DNNReturnType proc_from_frame_to_dnn_frameprocessing(AVFrame *frame, DNND
         }
         sws_scale(sws_ctx, (const uint8_t **)frame->data,
                            frame->linesize, 0, frame->height,
-                           (uint8_t * const*)(&input->data),
+                           (uint8_t * const [4]){input->data, 0, 0, 0},
                            (const int [4]){frame->width * sizeof(float), 0, 0, 0});
         sws_freeContext(sws_ctx);
         break;
@@ -236,7 +236,7 @@  DNNReturnType ff_frame_to_dnn_classify(AVFrame *frame, DNNData *input, uint32_t
 
     sws_scale(sws_ctx, (const uint8_t *const *)&bbox_data, frame->linesize,
                        0, height,
-                       (uint8_t *const *)(&input->data), linesizes);
+                       (uint8_t *const [4]){input->data, 0, 0, 0}, linesizes);
 
     sws_freeContext(sws_ctx);
 
@@ -266,7 +266,7 @@  static DNNReturnType proc_from_frame_to_dnn_analytics(AVFrame *frame, DNNData *i
     }
 
     sws_scale(sws_ctx, (const uint8_t *const *)frame->data, frame->linesize, 0, frame->height,
-                       (uint8_t *const *)(&input->data), linesizes);
+                       (uint8_t *const [4]){input->data, 0, 0, 0}, linesizes);
 
     sws_freeContext(sws_ctx);
     return DNN_SUCCESS;