[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-1630-gae23c3c

[Bastiaan Jacques]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  ae23c3cf66265fccad2241878f1d19240c5fdfc2 (commit)
      from  b068dc8074ab77e4838a2b0f806089ba257ad4ca (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=ae23c3cf66265fccad2241878f1d19240c5fdfc2


commit ae23c3cf66265fccad2241878f1d19240c5fdfc2
Author: Bastiaan Jacques <address@hidden>
Date:   Mon Jul 1 21:17:58 2013 +0200

    Savannah #39388: Avoid heap overflow by storing RGBA data in an 
appropriately-sized buffer.

diff --git a/libbase/GnashImageJpeg.cpp b/libbase/GnashImageJpeg.cpp
index 3ac4e24..4af2573 100644
--- a/libbase/GnashImageJpeg.cpp
+++ b/libbase/GnashImageJpeg.cpp
@@ -352,7 +352,7 @@ JpegInput::read()
     // Until this point the type should be GNASH_IMAGE_INVALID.
     // It's possible to create transparent JPEG data by merging an
     // alpha channel, but that is handled explicitly elsewhere.
-    _type = TYPE_RGB;
+    _type = getComponents() == 4 ? TYPE_RGBA : TYPE_RGB;
 }
 
 

-----------------------------------------------------------------------

Summary of changes:
 libbase/GnashImageJpeg.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


hooks/post-receive
-- 
Gnash