freetype-commit
[Top][All Lists]
Advanced

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

[freetype2] master 580c94d: Fix minor ASAN run-time warnings.


From: Werner LEMBERG
Subject: [freetype2] master 580c94d: Fix minor ASAN run-time warnings.
Date: Wed, 25 Jul 2018 01:03:45 -0400 (EDT)

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

    Fix minor ASAN run-time warnings.
    
    * src/base/ftutil.c (ft_mem_alloc, ft_mem_realloc): Only call
    `FT_MEM_ZERO' if we actually have a buffer.
    (ft_mem_dup): Only call `ft_memcpy' if we actually have a buffer.
---
 ChangeLog         | 8 ++++++++
 src/base/ftutil.c | 6 +++---
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0096724..fdc9662 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2018-07-25  Werner Lemberg  <address@hidden>
+
+       Fix minor ASAN run-time warnings.
+
+       * src/base/ftutil.c (ft_mem_alloc, ft_mem_realloc): Only call
+       `FT_MEM_ZERO' if we actually have a buffer.
+       (ft_mem_dup): Only call `ft_memcpy' if we actually have a buffer.
+
 2018-07-24  Alexei Podtelezhnikov  <address@hidden>
 
        [build] Fortify dllexport/dllimport attributes (#53969,#54330).
diff --git a/src/base/ftutil.c b/src/base/ftutil.c
index 826541c..eced7bb 100644
--- a/src/base/ftutil.c
+++ b/src/base/ftutil.c
@@ -54,7 +54,7 @@
     FT_Error    error;
     FT_Pointer  block = ft_mem_qalloc( memory, size, &error );
 
-    if ( !error && size > 0 )
+    if ( !error && block && size > 0 )
       FT_MEM_ZERO( block, size );
 
     *p_error = error;
@@ -101,7 +101,7 @@
 
     block = ft_mem_qrealloc( memory, item_size,
                              cur_count, new_count, block, &error );
-    if ( !error && new_count > cur_count )
+    if ( !error && block && new_count > cur_count )
       FT_MEM_ZERO( (char*)block + cur_count * item_size,
                    ( new_count - cur_count ) * item_size );
 
@@ -185,7 +185,7 @@
     FT_Pointer  p = ft_mem_qalloc( memory, (FT_Long)size, &error );
 
 
-    if ( !error && address )
+    if ( !error && address && size > 0 )
       ft_memcpy( p, address, size );
 
     *p_error = error;



reply via email to

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