freetype-commit
[Top][All Lists]
Advanced

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

[freetype2] master d949a3d: [smooth] Avoid conditional jump on uninitial


From: Werner LEMBERG
Subject: [freetype2] master d949a3d: [smooth] Avoid conditional jump on uninitialized value (#49711).
Date: Tue, 29 Nov 2016 11:10:07 +0000 (UTC)

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

    [smooth] Avoid conditional jump on uninitialized value (#49711).
    
    * src/smooth/ftgrays.c (gray_raster_render): Initialize `worker'.
---
 ChangeLog            |    6 ++++++
 src/smooth/ftgrays.c |    6 ++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9eda81b..033dee2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2016-11-29  Werner Lemberg  <address@hidden>
+
+       [smooth] Avoid conditional jump on uninitialized value (#49711).
+
+       * src/smooth/ftgrays.c (gray_raster_render): Initialize `worker'.
+
 2016-11-27  Nikolaus Waxweiler  <address@hidden>
 
        [autofit] Code shuffling.
diff --git a/src/smooth/ftgrays.c b/src/smooth/ftgrays.c
index 7e83fb1..ccfd603 100644
--- a/src/smooth/ftgrays.c
+++ b/src/smooth/ftgrays.c
@@ -1840,8 +1840,8 @@ typedef ptrdiff_t  FT_PtrDist;
   gray_raster_render( FT_Raster                raster,
                       const FT_Raster_Params*  params )
   {
-    const FT_Outline*  outline     = (const FT_Outline*)params->source;
-    const FT_Bitmap*   target_map  = params->target;
+    const FT_Outline*  outline    = (const FT_Outline*)params->source;
+    const FT_Bitmap*   target_map = params->target;
     FT_BBox            cbox, clip;
 
 #ifndef FT_STATIC_RASTER
@@ -1870,6 +1870,8 @@ typedef ptrdiff_t  FT_PtrDist;
            outline->contours[outline->n_contours - 1] + 1 )
       return FT_THROW( Invalid_Outline );
 
+    FT_ZERO( worker );
+
     ras.outline = *outline;
 
     if ( params->flags & FT_RASTER_FLAG_DIRECT )



reply via email to

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