← Back to branch summary

~ubuntu-branches/ubuntu/precise/tiff/precise-security

« back to all changes in this revision

Viewing changes to debian/patches/CVE-2014-8130.patch

  • Committer: Package Import Robot
  • Author(s): Marc Deslauriers
  • Date: 2015-03-30 08:11:18 UTC
  • Revision ID: package-import@ubuntu.com-20150330081118-bvaoaii1act27voq
Tags: 3.9.5-2ubuntu1.7
* SECURITY UPDATE: Fix multiple security issues
  - debian/patches/CVE-2014-81xx-1.patch to CVE-2014-81xx-11.patch
  - debian/patches/CVE-2014-8128-5.patch
  - debian/patches/CVE-2014-9655-1.patch to CVE-2014-9655-3.patch
  - debian/patches/read_overrun.patch
  - debian/patches/CVE-2014-8130.patch
  - CVE-2014-8127 (partially)
  - CVE-2014-8128
  - CVE-2014-8129
  - CVE-2014-8130
  - CVE-2014-9330
  - CVE-2014-9655

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/CVE-2014-8130.patch
 
1
From 3c5eb8b1be544e41d2c336191bc4936300ad7543 Mon Sep 17 00:00:00 2001
 
2
From: bfriesen <bfriesen>
 
3
Date: Sun, 18 Nov 2012 17:51:52 +0000
 
4
Subject: [PATCH] * libtiff/tif_{unix,vms,win32}.c (_TIFFmalloc): ANSI C does
 
5
 not require malloc() to return NULL pointer if requested allocation size is
 
6
 zero.  Assure that _TIFFmalloc does.
 
7
 
 
8
---
 
9
 ChangeLog           | 6 ++++++
 
10
 libtiff/tif_unix.c  | 3 +++
 
11
 libtiff/tif_vms.c   | 3 +++
 
12
 libtiff/tif_win32.c | 3 +++
 
13
 4 files changed, 15 insertions(+)
 
14
 
 
15
Index: tiff-3.9.5/libtiff/tif_unix.c
 
16
===================================================================
 
17
--- tiff-3.9.5.orig/libtiff/tif_unix.c  2015-03-30 08:10:36.153348726 -0400
 
18
+++ tiff-3.9.5/libtiff/tif_unix.c       2015-03-30 08:10:36.149348691 -0400
 
19
@@ -238,6 +238,9 @@
 
20
 void*
 
21
 _TIFFmalloc(tsize_t s)
 
22
 {
 
23
+        if (s == 0)
 
24
+                return ((void *) NULL);
 
25
+
 
26
        return (malloc((size_t) s));
 
27
 }
 
28