From 45481435f93b52f944c5f876e95fb7bfba56ed4f Mon Sep 17 00:00:00 2001 From: Sreerenj Balachandran Date: Wed, 28 May 2014 15:02:41 -0600 Subject: Fix the segfault while encoding multiple slice per frame. Zero initialize the packed raw data index array and packed slice header index array during each preallocation. Signed-off-by: Sreerenj Balachandran Reviewed-by: Zhao, Yakui (cherry picked from commit fbbe401aa28a0b3859d587ef08f0df15a2f7c8f2) --- src/i965_drv_video.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/i965_drv_video.c b/src/i965_drv_video.c index 82a4e69..68a6052 100755 --- a/src/i965_drv_video.c +++ b/src/i965_drv_video.c @@ -2489,6 +2489,7 @@ i965_encoder_render_picture(VADriverContextP ctx, * the packed data index/count for the slice */ if (encode->max_slice_params_ext > encode->slice_num) { + int slice_num = encode->slice_num; encode->slice_num = encode->max_slice_params_ext; encode->slice_rawdata_index = realloc(encode->slice_rawdata_index, encode->slice_num * sizeof(int)); @@ -2496,6 +2497,12 @@ i965_encoder_render_picture(VADriverContextP ctx, encode->slice_num * sizeof(int)); encode->slice_header_index = realloc(encode->slice_header_index, encode->slice_num * sizeof(int)); + memset(encode->slice_rawdata_index + slice_num, 0, + sizeof(int) * NUM_SLICES); + memset(encode->slice_rawdata_count + slice_num, 0, + sizeof(int) * NUM_SLICES); + memset(encode->slice_header_index + slice_num, 0, + sizeof(int) * NUM_SLICES); if ((encode->slice_rawdata_index == NULL) || (encode->slice_header_index == NULL) || (encode->slice_rawdata_count == NULL)) { -- cgit v1.2.3