Skip to content
This repository was archived by the owner on Jan 31, 2025. It is now read-only.

Commit 2fa1925

Browse files
committed
Avoid NULL pointer in avc_get_first_mb_bit_offset_with_epb()
This fixes #92 Signed-off-by: Xiang, Haihao <[email protected]> (cherry picked from commit 1d43c90)
1 parent 24d43e4 commit 2fa1925

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

src/i965_decoder_utils.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ avc_get_first_mb_bit_offset_with_epb(
331331
{
332332
unsigned int in_slice_data_bit_offset = slice_param->slice_data_bit_offset;
333333
unsigned int out_slice_data_bit_offset;
334-
unsigned int i, j, n, buf_size, data_size, header_size;
334+
unsigned int i, j, n = 0, buf_size, data_size, header_size;
335335
uint8_t *buf;
336336
int ret;
337337

@@ -343,6 +343,10 @@ avc_get_first_mb_bit_offset_with_epb(
343343
buf_size = data_size;
344344

345345
buf = malloc(buf_size);
346+
347+
if (!buf)
348+
goto out;
349+
346350
ret = dri_bo_get_subdata(
347351
slice_data_bo, slice_param->slice_data_offset,
348352
buf_size, buf
@@ -356,6 +360,7 @@ avc_get_first_mb_bit_offset_with_epb(
356360

357361
free(buf);
358362

363+
out:
359364
out_slice_data_bit_offset = in_slice_data_bit_offset + n * 8;
360365

361366
if (mode_flag == ENTROPY_CABAC)

0 commit comments

Comments
 (0)