Skip to content

V
vlc-2-2
Commit 1a974cea authored by Grigori Goronzy's avatar Grigori Goronzy Committed by Jean-Baptiste Kempf
Browse files
Options

libass: avoid crash on ASS_Images which have width or height == 0

parent 4812448c
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 3 deletions
modules/codec/libass.c
View file @ 1a974cea
...@@ -449,7 +449,8 @@ static int BuildRegions( spu_t *p_spu, rectangle_t *p_region, int i_max_region, ...@@ -449,7 +449,8 @@ static int BuildRegions( spu_t *p_spu, rectangle_t *p_region, int i_max_region,
#endif #endif
for( p_tmp = p_img_list, i_count = 0; p_tmp != NULL; p_tmp = p_tmp->next ) for( p_tmp = p_img_list, i_count = 0; p_tmp != NULL; p_tmp = p_tmp->next )
i_count++; if( p_tmp->w > 0 && p_tmp->h > 0 )
i_count++;
if( i_count <= 0 ) if( i_count <= 0 )
return 0; return 0;
...@@ -457,8 +458,9 @@ static int BuildRegions( spu_t *p_spu, rectangle_t *p_region, int i_max_region, ...@@ -457,8 +458,9 @@ static int BuildRegions( spu_t *p_spu, rectangle_t *p_region, int i_max_region,
if( !pp_img ) if( !pp_img )
return 0; return 0;
for( p_tmp = p_img_list, i_count = 0; p_tmp != NULL; p_tmp = p_tmp->next, i_count++ ) for( p_tmp = p_img_list, i_count = 0; p_tmp != NULL; p_tmp = p_tmp->next )
pp_img[i_count] = p_tmp; if( p_tmp->w > 0 && p_tmp->h > 0 )
pp_img[i_count++] = p_tmp;
/* */ /* */
const int i_w_inc = __MAX( ( i_width + 49 ) / 50, 32 ); const int i_w_inc = __MAX( ( i_width + 49 ) / 50, 32 );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment