Commit 6fe9f71b authored by Laurent Aimar's avatar Laurent Aimar Committed by Jean-Baptiste Kempf

Fixed a segfault when trying to render a unbreakable string.

(cherry picked from commit 18175698)
Signed-off-by: default avatarJean-Baptiste Kempf <jb@videolan.org>
parent 9851000b
...@@ -1724,10 +1724,9 @@ static int RenderTag( filter_t *p_filter, FT_Face p_face, int i_font_color, ...@@ -1724,10 +1724,9 @@ static int RenderTag( filter_t *p_filter, FT_Face p_face, int i_font_color,
glyph_size.xMin + ((FT_BitmapGlyph)tmp_glyph)->left; glyph_size.xMin + ((FT_BitmapGlyph)tmp_glyph)->left;
if( line.xMax > (int)p_filter->fmt_out.video.i_visible_width - 20 ) if( line.xMax > (int)p_filter->fmt_out.video.i_visible_width - 20 )
{ {
while( --i > *pi_start ) for( ; i >= *pi_start; i-- )
{
FT_Done_Glyph( (FT_Glyph)p_line->pp_glyphs[ i ] ); FT_Done_Glyph( (FT_Glyph)p_line->pp_glyphs[ i ] );
} i = *pi_start;
while( psz_unicode > psz_unicode_start && *psz_unicode != ' ' ) while( psz_unicode > psz_unicode_start && *psz_unicode != ' ' )
{ {
...@@ -1751,8 +1750,6 @@ static int RenderTag( filter_t *p_filter, FT_Face p_face, int i_font_color, ...@@ -1751,8 +1750,6 @@ static int RenderTag( filter_t *p_filter, FT_Face p_face, int i_font_color,
p_result->x = __MAX( p_result->x, line.xMax ); p_result->x = __MAX( p_result->x, line.xMax );
p_result->y = __MAX( p_result->y, __MAX( p_line->i_height, p_result->y = __MAX( p_result->y, __MAX( p_line->i_height,
i_yMax - i_yMin ) ); i_yMax - i_yMin ) );
*pi_start = i;
return VLC_SUCCESS; return VLC_SUCCESS;
} }
else else
......
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