freetype-commit
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[freetype2] master 2157d8f: [base] Avoid undefined behaviour in lcd filt


From: Werner LEMBERG
Subject: [freetype2] master 2157d8f: [base] Avoid undefined behaviour in lcd filtering code (#53727).
Date: Tue, 24 Apr 2018 04:31:30 -0400 (EDT)

branch: master
commit 2157d8fa6f7e12063ca166476ed2223d24234db7
Author: Ben Wagner <address@hidden>
Commit: Werner Lemberg <address@hidden>

    [base] Avoid undefined behaviour in lcd filtering code (#53727).
    
    * src/base/ftlcdfil.c (ft_lcd_filter_fir, _ft_lcd_filter_legacy):
    Ensure `height > 0'.
---
 ChangeLog           | 7 +++++++
 src/base/ftlcdfil.c | 4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 690d074..cd8b153 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2018-04-24  Ben Wagner  <address@hidden>
+
+       [base] Avoid undefined behaviour in lcd filtering code (#53727).
+
+       * src/base/ftlcdfil.c (ft_lcd_filter_fir, _ft_lcd_filter_legacy):
+       Ensure `height > 0'.
+
 2018-04-22  Werner Lemberg  <address@hidden>
 
        * src/base/ftoutln.c (FT_Outline_Decompose): Improve error tracing.
diff --git a/src/base/ftlcdfil.c b/src/base/ftlcdfil.c
index 5c38911..8d314df 100644
--- a/src/base/ftlcdfil.c
+++ b/src/base/ftlcdfil.c
@@ -77,7 +77,7 @@
 
 
     /* take care of bitmap flow */
-    if ( pitch > 0 )
+    if ( pitch > 0 && height > 0 )
       origin += pitch * (FT_Int)( height - 1 );
 
     /* horizontal in-place FIR filter */
@@ -192,7 +192,7 @@
 
 
     /* take care of bitmap flow */
-    if ( pitch > 0 )
+    if ( pitch > 0 && height > 0 )
       origin += pitch * (FT_Int)( height - 1 );
 
     /* horizontal in-place intra-pixel filter */



reply via email to

[Prev in Thread] Current Thread [Next in Thread]