[Pkg-php-commits] [php/debian-sid] Drop exif_read_data-segfault patch, merged upstream

Raphael Geissert geissert at debian.org
Sun Feb 7 23:17:14 UTC 2010


---
 debian/patches/exif_read_data-segfault.patch |   13 -------------
 debian/patches/series                        |    1 -
 2 files changed, 0 insertions(+), 14 deletions(-)
 delete mode 100644 debian/patches/exif_read_data-segfault.patch

diff --git a/debian/patches/exif_read_data-segfault.patch b/debian/patches/exif_read_data-segfault.patch
deleted file mode 100644
index c97d63c..0000000
--- a/debian/patches/exif_read_data-segfault.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/ext/exif/exif.c
-+++ b/ext/exif/exif.c
-@@ -3214,6 +3214,10 @@ static void exif_process_TIFF_in_JPEG(im
- 		exif_error_docref(NULL EXIFERR_CC, ImageInfo, E_WARNING, "Invalid IFD start");
- 		return;
- 	}
-+	if (offset_of_ifd > length) {
-+		exif_error_docref(NULL EXIFERR_CC, ImageInfo, E_WARNING, "Invalid IFD start");
-+		return;
-+	}
- 
- 	ImageInfo->sections_found |= FOUND_IFD0;
- 	/* First directory starts at offset 8. Offsets starts at 0. */
diff --git a/debian/patches/series b/debian/patches/series
index 11e0542..01c5ef1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -32,7 +32,6 @@ force_libmysqlclient_r.patch
 bad_whatis_entries.patch
 gentoo/009_ob-memory-leaks.patch
 mssql-null-exception.patch
-exif_read_data-segfault.patch
 sybase-alias.patch
 strcmp_null-OnUpdateErrorLog.patch
 deprecate_short_open_tag
-- 
1.6.3.3





More information about the Pkg-php-commits mailing list