shithub: freetype+ttf2subf

Info  •  Files  •  Log  •  Branches

[bzip2, gzip] Avoid access of unitialized memory (#46109).

* src/bzip2/ftbzip2.c (ft_bzip2_file_fill_output), src/gzip/ftgzip.c
(ft_gzip_file_fill_output): In case of an error, adjust the limit to
avoid copying uninitialized memory.

git/fs: mount .git/fs: mount/attach disallowed

--- a/ChangeLog

+++ b/ChangeLog

@@ -1,3 +1,11 @@

+2015-10-03  Werner Lemberg  <[email protected]>

+

+	[bzip2, gzip] Avoid access of unitialized memory (#46109).

+

+	* src/bzip2/ftbzip2.c (ft_bzip2_file_fill_output), src/gzip/ftgzip.c

+	(ft_gzip_file_fill_output): In case of an error, adjust the limit to

+	avoid copying uninitialized memory.

+

 2015-10-01  Alexei Podtelezhnikov  <[email protected]>

 	[smooth] Clean up worker.

--- a/src/bzip2/ftbzip2.c

+++ b/src/bzip2/ftbzip2.c

@@ -310,7 +310,8 @@

       }

       else if ( err != BZ_OK )

       {

-        error = FT_THROW( Invalid_Stream_Operation );

+        zip->limit = zip->cursor;

+        error      = FT_THROW( Invalid_Stream_Operation );

         break;

       }

     }

--- a/src/gzip/ftgzip.c

+++ b/src/gzip/ftgzip.c

@@ -433,7 +433,8 @@

       }

       else if ( err != Z_OK )

       {

-        error = FT_THROW( Invalid_Stream_Operation );

+        zip->limit = zip->cursor;

+        error      = FT_THROW( Invalid_Stream_Operation );

         break;

       }

     }