freetype-commit
[Top][All Lists]
Advanced

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

[freetype2] master 548f68d: [lzw] Avoid invalid left shift.


From: Werner LEMBERG
Subject: [freetype2] master 548f68d: [lzw] Avoid invalid left shift.
Date: Tue, 16 Aug 2016 07:47:00 +0000 (UTC)

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

    [lzw] Avoid invalid left shift.
    
    * src/lzw/ftzopen.c (ft_lzwstate_get_code): Limit `num_bits'.
---
 ChangeLog         |    6 ++++++
 src/lzw/ftzopen.c |    3 +++
 2 files changed, 9 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index da002ab..b01e3c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2016-08-16  Werner Lemberg  <address@hidden>
 
+       [lzw] Avoid invalid left shift.
+
+       * src/lzw/ftzopen.c (ft_lzwstate_get_code): Limit `num_bits'.
+
+2016-08-16  Werner Lemberg  <address@hidden>
+
        [lzw] Avoid buffer overrun.
 
        Reported as
diff --git a/src/lzw/ftzopen.c b/src/lzw/ftzopen.c
index 32839cc..ae79fdd 100644
--- a/src/lzw/ftzopen.c
+++ b/src/lzw/ftzopen.c
@@ -65,6 +65,9 @@
     FT_Int    result;
 
 
+    if ( num_bits > LZW_MAX_BITS )
+      return -1;
+
     if ( state->buf_clear                    ||
          offset >= state->buf_size           ||
          state->free_ent >= state->free_bits )



reply via email to

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