[freeimage] 02/03: Refresh patch.

[Anton Gladky]

This is an automated email from the git hooks/post-receive script.

gladk pushed a commit to branch debian/wheezy
in repository freeimage.

commit 7a0b1adcb198e0deba1d3756385a8d17b7507503
Author: Anton Gladky <gladk at debian.org>
Date:   Wed Nov 4 06:42:05 2015 +0100

    Refresh patch.
---
 .../fix_Integer_overflow_in_ljpeg_start.patch      | 34 ++++++++++++----------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/debian/patches/fix_Integer_overflow_in_ljpeg_start.patch b/debian/patches/fix_Integer_overflow_in_ljpeg_start.patch
index 3b84e80..79814a2 100644
--- a/debian/patches/fix_Integer_overflow_in_ljpeg_start.patch
+++ b/debian/patches/fix_Integer_overflow_in_ljpeg_start.patch
@@ -8,21 +8,11 @@ Bug: https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2015-3885
 Reviewed-By: Anton Gladky <gladk at debian.org>
 Last-Update: 2015-10-29
 
---- freeimage-3.15.4.orig/Source/LibRawLite/dcraw/dcraw.c
-+++ freeimage-3.15.4/Source/LibRawLite/dcraw/dcraw.c
-@@ -768,7 +768,8 @@ struct jhead {
- 
- int CLASS ljpeg_start (struct jhead *jh, int info_only)
- {
--  int c, tag, len;
-+  int c, tag;
-+  ushort len;
-   uchar data[0x10000];
-   const uchar *dp;
- 
---- freeimage-3.15.4.orig/Source/LibRawLite/internal/dcraw_common.cpp
-+++ freeimage-3.15.4/Source/LibRawLite/internal/dcraw_common.cpp
-@@ -630,7 +630,8 @@ void CLASS canon_compressed_load_raw()
+Index: freeimage/Source/LibRawLite/internal/dcraw_common.cpp
+===================================================================
+--- freeimage.orig/Source/LibRawLite/internal/dcraw_common.cpp
++++ freeimage/Source/LibRawLite/internal/dcraw_common.cpp
+@@ -593,7 +593,8 @@ void CLASS canon_compressed_load_raw()
  
  int CLASS ljpeg_start (struct jhead *jh, int info_only)
  {
@@ -32,3 +22,17 @@ Last-Update: 2015-10-29
    uchar data[0x10000];
    const uchar *dp;
  
+Index: freeimage/Source/LibRawLite/dcraw/dcraw.c
+===================================================================
+--- freeimage.orig/Source/LibRawLite/dcraw/dcraw.c
++++ freeimage/Source/LibRawLite/dcraw/dcraw.c
+@@ -778,7 +778,8 @@ struct jhead {
+ 
+ int CLASS ljpeg_start (struct jhead *jh, int info_only)
+ {
+-  int c, tag, len;
++  int c, tag;
++  ushort len;
+   uchar data[0x10000];
+   const uchar *dp;
+ 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/freeimage.git