[vlc-devel] [PATCH] freetype: avoid left shift of negative values

Salah-Eddin Shaban salah at videolan.org
Mon Feb 1 22:20:31 CET 2016


Close #16484
---
 modules/text_renderer/freetype/text_layout.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/modules/text_renderer/freetype/text_layout.c b/modules/text_renderer/freetype/text_layout.c
index f302e9d..a8c8610 100644
--- a/modules/text_renderer/freetype/text_layout.c
+++ b/modules/text_renderer/freetype/text_layout.c
@@ -1495,6 +1495,13 @@ int LayoutText( filter_t *p_filter, line_desc_t **pp_lines,
              * and any extra width caused by visual reordering
              */
             int i_max_width = ( int ) p_filter->fmt_out.video.i_visible_width - i_max_advance_x;
+
+            if( i_max_width <= 0 )
+            {
+                msg_Err( p_filter, "LayoutText(): Invalid max width" );
+                goto error;
+            }
+
             if( LayoutParagraph( p_filter, p_paragraph,
                                  i_max_width, pp_line, b_grid ) )
                 goto error;
-- 
1.9.1



More information about the vlc-devel mailing list