[Forensics-changes] [exifprobe] 01/01: Imported Debian patch 2.0.1-6
Joao Eriberto Mota Filho
eriberto at moszumanska.debian.org
Fri May 29 03:41:58 UTC 2015
This is an automated email from the git hooks/post-receive script.
eriberto pushed a commit to branch debian
in repository exifprobe.
commit 1f3e03b4931b6b88eb9998fbfc8b6495cb631193
Author: Joao Eriberto Mota Filho <eriberto at debian.org>
Date: Thu May 28 18:58:35 2015 -0300
Imported Debian patch 2.0.1-6
---
debian/changelog | 10 +++++
debian/control | 1 +
debian/copyright | 1 +
debian/patches/fix-issues-found-by-afl | 67 ++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
debian/watch | 3 +-
6 files changed, 81 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index e067d62..98372c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+exifprobe (2.0.1-6) unstable; urgency=medium
+
+ * Upload to unstable.
+ * debian/control: added the Homepage field.
+ * debian/patches/fix-issues-found-by-afl: added to fix some issues detected
+ by AFL. (Closes: #779525, #779527)
+ * debian/watch: pointing to new upstream site.
+
+ -- Joao Eriberto Mota Filho <eriberto at debian.org> Thu, 28 May 2015 18:58:35 -0300
+
exifprobe (2.0.1-5) experimental; urgency=medium
* debian/copyright: updated the packaging copyright years.
diff --git a/debian/control b/debian/control
index 8212053..45658c3 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,7 @@ Maintainer: Debian Forensics <forensics-devel at lists.alioth.debian.org>
Uploaders: Joao Eriberto Mota Filho <eriberto at debian.org>
Build-Depends: debhelper (>= 9), xutils-dev
Standards-Version: 3.9.6
+Homepage: https://github.com/hfiguiere/exifprobe
Vcs-Browser: http://anonscm.debian.org/cgit/forensics/exifprobe.git
Vcs-Git: git://anonscm.debian.org/forensics/exifprobe.git
diff --git a/debian/copyright b/debian/copyright
index fda4c88..72f094b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,5 +1,6 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: exifprobe
+Source: https://github.com/hfiguiere/exifprobe
Files: *
Copyright: Duane H. Hesser <dhh at virtual-cafe.com>
diff --git a/debian/patches/fix-issues-found-by-afl b/debian/patches/fix-issues-found-by-afl
new file mode 100644
index 0000000..a8eb6ed
--- /dev/null
+++ b/debian/patches/fix-issues-found-by-afl
@@ -0,0 +1,67 @@
+Description: fix some issues found by Henri Sarlo, using AFL (American
+ Fuzzy Lop). Closes: #779525, #779527.
+Author: Hubert Figuière <hub at figuiere.net>
+Last-Update: 2015-03-04
+Index: exifprobe-2.0.1/interpret.c
+===================================================================
+--- exifprobe-2.0.1.orig/interpret.c
++++ exifprobe-2.0.1/interpret.c
+@@ -75,7 +75,10 @@ interpret_value(struct ifd_entry *entry_
+ print_compression(entry_ptr->value);
+ break;
+ case TIFFTAG_PhotometricInterpretation:
+- print_photometric(entry_ptr->value,summary_entry->fileformat);
++ if (summary_entry)
++ {
++ print_photometric(entry_ptr->value,summary_entry->fileformat);
++ }
+ break;
+ case TIFFTAG_Orientation:
+ print_orientation(entry_ptr->value);
+Index: exifprobe-2.0.1/misc.c
+===================================================================
+--- exifprobe-2.0.1.orig/misc.c
++++ exifprobe-2.0.1/misc.c
+@@ -303,10 +303,19 @@ scan_summary(struct image_summary *summa
+ if(summary_entry->bps[0] && summary_entry->spp)
+ {
+ int i;
++ int spp = summary_entry->spp;
+ float total_bits,bytes_per_pixel;
+
+ total_bits = 0;
+- for(i = 0; i < summary_entry->spp; ++i)
++ if (spp > MAXSAMPLE)
++ {
++ spp = MAXSAMPLE;
++ if(Debug & 0x4)
++ {
++ printf("CLAMPING spp\n");
++ }
++ }
++ for(i = 0; i < spp; ++i)
+ total_bits += summary_entry->bps[i];
+ bytes_per_pixel = total_bits / 8.0;
+ if(Debug & 0x4)
+Index: exifprobe-2.0.1/process.c
+===================================================================
+--- exifprobe-2.0.1.orig/process.c
++++ exifprobe-2.0.1/process.c
+@@ -687,12 +687,16 @@ process_tiff_ifd(FILE *inptr,unsigned sh
+ case EXIFTAG_Interoperability:
+ /* This doesn't belong in a TIFF IFD, but */
+ /* be prepared. */
++ /* Also we make sure we are not calling on */
++ /* the same ifd offset */
+ PUSHCOLOR(INTEROP_COLOR);
+- value_offset = process_tiff_ifd(inptr,byteorder,
++ if (entry_ptr->value != ifd_offset) {
++ value_offset = process_tiff_ifd(inptr,byteorder,
+ entry_ptr->value,fileoffset_base,
+ next_ifd_offset,summary_entry,
+ listname,INTEROP_IFD,ifdnum,0,
+ indent);
++ }
+ value_offset = 0;
+ POPCOLOR();
+ break;
diff --git a/debian/patches/series b/debian/patches/series
index 3104a9e..b4f04ae 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+fix-issues-found-by-afl
fix-exifgrep
fix-manpages
fix_spelling_error
diff --git a/debian/watch b/debian/watch
index d993b12..1fe57be 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,2 @@
version=3
-opts=dversionmangle=s/.*/0.No-Site/ \
-https://people.debian.org/~eriberto/ FakeWatchNoUpstreamSiteForThisPackage-(\d\S+)\.gz
+https://github.com/hfiguiere/exifprobe/releases .*/archive/v?(\d\S+)\.tar\.(?:bz2|gz|xz)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/forensics/exifprobe.git
More information about the forensics-changes
mailing list