[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[freetype2] master f0fa7a6: [cff] Avoid null pointer passed to FT_MEM_CO
From: |
Werner LEMBERG |
Subject: |
[freetype2] master f0fa7a6: [cff] Avoid null pointer passed to FT_MEM_COPY (#48984). |
Date: |
Sat, 3 Sep 2016 04:33:49 +0000 (UTC) |
branch: master
commit f0fa7a67bfc334775b030d95cac763eeb7247436
Author: Werner Lemberg <address@hidden>
Commit: Werner Lemberg <address@hidden>
[cff] Avoid null pointer passed to FT_MEM_COPY (#48984).
* src/cff/cffload.c (cff_index_get_name): Check `byte_len'.
---
ChangeLog | 6 ++++++
src/cff/cffload.c | 3 ++-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/ChangeLog b/ChangeLog
index eae8f2b..5e7cc03 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2016-09-03 Werner Lemberg <address@hidden>
+
+ [cff] Avoid null pointer passed to FT_MEM_COPY (#48984).
+
+ * src/cff/cffload.c (cff_index_get_name): Check `byte_len'.
+
2016-09-02 Werner Lemberg <address@hidden>
[unix] Enable 64bit support in file system access (#48962).
diff --git a/src/cff/cffload.c b/src/cff/cffload.c
index 3d1bda9..470fa82 100644
--- a/src/cff/cffload.c
+++ b/src/cff/cffload.c
@@ -602,7 +602,8 @@
if ( !FT_ALLOC( name, byte_len + 1 ) )
{
- FT_MEM_COPY( name, bytes, byte_len );
+ if ( byte_len )
+ FT_MEM_COPY( name, bytes, byte_len );
name[byte_len] = 0;
}
cff_index_forget_element( idx, &bytes );
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [freetype2] master f0fa7a6: [cff] Avoid null pointer passed to FT_MEM_COPY (#48984).,
Werner LEMBERG <=