freetype-commit
[Top][All Lists]
Advanced

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

[freetype2] master 9f6ed10: * src/base/ftbitmap.c (FT_Bitmap_Blend): Che


From: Werner LEMBERG
Subject: [freetype2] master 9f6ed10: * src/base/ftbitmap.c (FT_Bitmap_Blend): Check target pitch.
Date: Mon, 22 Apr 2019 02:12:10 -0400 (EDT)

branch: master
commit 9f6ed10545b1009cce86289f793165dd7e4b7c9e
Author: Werner Lemberg <address@hidden>
Commit: Werner Lemberg <address@hidden>

    * src/base/ftbitmap.c (FT_Bitmap_Blend): Check target pitch.
    
    Problem reported by Sender Ghost <address@hidden>.
---
 ChangeLog           | 6 ++++++
 src/base/ftbitmap.c | 7 +++++++
 2 files changed, 13 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 290c865..78b82c9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2019-04-22  Werner Lemberg  <address@hidden>
 
+       * src/base/ftbitmap.c (FT_Bitmap_Blend): Check target pitch.
+
+       Problem reported by Sender Ghost <address@hidden>.
+
+2019-04-22  Werner Lemberg  <address@hidden>
+
        Fix return value of `FT_Set_Named_Instance' (#56186).
 
        * src/truetype/ttgxvar.c (TT_Set_Named_Instance): Correctly handle
diff --git a/src/base/ftbitmap.c b/src/base/ftbitmap.c
index 1bdcd9e..7e5e92d 100644
--- a/src/base/ftbitmap.c
+++ b/src/base/ftbitmap.c
@@ -971,6 +971,13 @@
 
 
       pitch = target->pitch;
+      if ( !pitch )
+      {
+        FT_TRACE5(( "FT_Blend_Bitmap:"
+                    " zero target bitmap pitch is invalid\n" ));
+        return FT_THROW( Invalid_Argument );
+      }
+
       if ( pitch < 0 )
         pitch = -pitch;
 



reply via email to

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