avcodec/dxva2_*: Initialize dxva_data_ptr

Related: CID1591888 Uninitialized scalar variable Related: CID1591925 Uninitialized pointer read Related: CID1591933 Uninitialized scalar variable

Michael Niedermayer committed 2 years ago

Commit 189bc841 parent 1d6a2ae5 files · +16 −7Browse files

Unified · Split

5 files

@@ -354,7 +354,7 @@ static int commit_bitstream_and_slice_buffer(AVCodecContext *avctx, · 353 unmodified lines
354	const AV1DecContext *h = avctx->priv_data;	354	const AV1DecContext *h = avctx->priv_data;
355	AVDXVAContext *ctx = DXVA_CONTEXT(avctx);	355	AVDXVAContext *ctx = DXVA_CONTEXT(avctx);
356	struct av1_dxva2_picture_context *ctx_pic = h->cur_frame.hwaccel_picture_private;	356	struct av1_dxva2_picture_context *ctx_pic = h->cur_frame.hwaccel_picture_private;
357	void *dxva_data_ptr;	357	void *dxva_data_ptr = NULL;
358	uint8_t *dxva_data;	358	uint8_t *dxva_data;
359	unsigned dxva_size;	359	unsigned dxva_size;
360	unsigned padding;	360	unsigned padding;
@@ -382,7 +382,7 @@ static int commit_bitstream_and_slice_buffer(AVCodecContext *avctx, · 21 unmodified lines
382		382
383	dxva_data = dxva_data_ptr;	383	dxva_data = dxva_data_ptr;
384		384
385	if (ctx_pic->bitstream_size > dxva_size) {	385	if (!dxva_data \|\| ctx_pic->bitstream_size > dxva_size) {
386	av_log(avctx, AV_LOG_ERROR, "Bitstream size exceeds hardware buffer");	386	av_log(avctx, AV_LOG_ERROR, "Bitstream size exceeds hardware buffer");
387	return -1;	387	return -1;
388	}	388	}

     const HEVCFrame *current_picture = h->cur_frame;
     struct hevc_dxva2_picture_context *ctx_pic = current_picture->hwaccel_picture_private;
     DXVA_Slice_HEVC_Short *slice = NULL;
-    void     *dxva_data_ptr;
+    void     *dxva_data_ptr = NULL;
     uint8_t  *dxva_data, *current, *end;
     unsigned dxva_size;
     void     *slice_data;
     }
 #endif
+    if (!dxva_data_ptr)
+        return -1;
     dxva_data = dxva_data_ptr;
     current = dxva_data;
     end = dxva_data + dxva_size;

         s->cur_pic.ptr->hwaccel_picture_private;
     const int is_field = s->picture_structure != PICT_FRAME;
     const unsigned mb_count = s->mb_width * (s->mb_height >> is_field);
-    void     *dxva_data_ptr;
+    void     *dxva_data_ptr = NULL;
     uint8_t  *dxva_data, *current, *end;
     unsigned dxva_size;
     unsigned i;
     }
 #endif
+    if (!dxva_data_ptr)
+        return -1;
     dxva_data = dxva_data_ptr;
     current = dxva_data;
     end = dxva_data + dxva_size;

     const unsigned start_code_size = avctx->codec_id == AV_CODEC_ID_VC1 ? sizeof(start_code) : 0;
     const unsigned mb_count = s->mb_width * (s->mb_height >> v->field_mode);
     DXVA_SliceInfo *slice = NULL;
-    void     *dxva_data_ptr;
+    void     *dxva_data_ptr = NULL;
     uint8_t  *dxva_data, *current, *end;
     unsigned dxva_size;
     unsigned padding;
     }
 #endif
+    if (!dxva_data_ptr)
+        return -1;
     dxva_data = dxva_data_ptr;
     current = dxva_data;
     end = dxva_data + dxva_size;

@@ -172,7 +172,7 @@ static int commit_bitstream_and_slice_buffer(AVCodecContext *avctx, · 171 unmodified lines
172	const VP9SharedContext *h = avctx->priv_data;	172	const VP9SharedContext *h = avctx->priv_data;
173	AVDXVAContext *ctx = DXVA_CONTEXT(avctx);	173	AVDXVAContext *ctx = DXVA_CONTEXT(avctx);
174	struct vp9_dxva2_picture_context *ctx_pic = h->frames[CUR_FRAME].hwaccel_picture_private;	174	struct vp9_dxva2_picture_context *ctx_pic = h->frames[CUR_FRAME].hwaccel_picture_private;
175	void *dxva_data_ptr;	175	void *dxva_data_ptr = NULL;
176	uint8_t *dxva_data;	176	uint8_t *dxva_data;
177	unsigned dxva_size;	177	unsigned dxva_size;
178	unsigned padding;	178	unsigned padding;
@@ -200,7 +200,7 @@ static int commit_bitstream_and_slice_buffer(AVCodecContext *avctx, · 21 unmodified lines
200		200
201	dxva_data = dxva_data_ptr;	201	dxva_data = dxva_data_ptr;
202		202
203	if (ctx_pic->slice.SliceBytesInBuffer > dxva_size) {	203	if (!dxva_data \|\| ctx_pic->slice.SliceBytesInBuffer > dxva_size) {
204	av_log(avctx, AV_LOG_ERROR, "Failed to build bitstream");	204	av_log(avctx, AV_LOG_ERROR, "Failed to build bitstream");
205	return -1;	205	return -1;
206	}	206	}

Keyboard shortcuts