[vlc-commits] freetype: fix integer overflow

Rémi Denis-Courmont git at videolan.org
Sat Aug 22 15:30:48 CEST 2015


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Aug 22 16:30:25 2015 +0300| [0aa6c19cdbf627b98890531f399e0c30a98a5d96] | committer: Rémi Denis-Courmont

freetype: fix integer overflow

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0aa6c19cdbf627b98890531f399e0c30a98a5d96
---

 modules/text_renderer/text_layout.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/text_renderer/text_layout.c b/modules/text_renderer/text_layout.c
index 9dcec5d..054d774 100644
--- a/modules/text_renderer/text_layout.c
+++ b/modules/text_renderer/text_layout.c
@@ -1050,10 +1050,10 @@ static int LayoutLine( filter_t *p_filter,
 
         bool b_karaoke = p_paragraph->pi_karaoke_bar[ i_paragraph_index ] != 0;
         p_ch->i_color = b_karaoke ?
-                        ( uint32_t ) p_glyph_style->i_karaoke_background_color
-                      |              p_glyph_style->i_karaoke_background_alpha << 24
-                      : ( uint32_t ) p_glyph_style->i_font_color
-                      |              p_glyph_style->i_font_alpha << 24;
+                        (uint32_t) p_glyph_style->i_karaoke_background_color
+                      | (uint32_t) p_glyph_style->i_karaoke_background_alpha << 24
+                      : (uint32_t) p_glyph_style->i_font_color
+                      | (uint32_t) p_glyph_style->i_font_alpha << 24;
 
         p_ch->i_line_thickness = i_line_thickness;
         p_ch->i_line_offset = i_line_offset;



More information about the vlc-commits mailing list