snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Activity

jhead: update to 3.02.

This commit is contained in:
maxice8 2018-12-12 05:29:02 -02:00 committed by maxice8
parent 344080e5f8
commit 2dc872c535
3 changed files with 4 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
srcpkgs/jhead/patches/CVE-2016-3822.patch
View File

@ -1,19 +0,0 @@
--- exif.c
+++ exif.c
@@ -9,6 +9,7 @@
#include "jhead.h"
#include <math.h>
+#include <stdint.h>
static unsigned char * DirWithThumbnailPtrs;
static double FocalplaneXRes;
@@ -527,7 +528,7 @@
unsigned OffsetVal;
OffsetVal = Get32u(DirEntry+8);
// If its bigger than 4 bytes, the dir entry contains an offset.
- if (OffsetVal+ByteCount > ExifLength){
+ if (OffsetVal > UINT32_MAX - ByteCount || OffsetVal+ByteCount > ExifLength){
// Bogus pointer offset and / or bytecount value
ErrNonfatal("Illegal value pointer for tag %04x in Exif", Tag,0);
continue;

23
srcpkgs/jhead/patches/CVE-2018-6612.patch
View File

@ -1,23 +0,0 @@
From: Ludovic Rousseau <rousseau@debian.org>
Date: Sat, 3 Feb 2018 10:23:09 +0100
Subject: Fix heap buffer overflow
Bug-Debian: http://bugs.debian.org/889272
---
exif.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/exif.c b/exif.c
index bcde6c8..1dee145 100644
--- exif.c
+++ exif.c
@@ -1020,7 +1020,7 @@ void process_EXIF (unsigned char * ExifSection, unsigned int length)
FirstOffset = Get32u(ExifSection+12);
if (FirstOffset < 8 || FirstOffset > 16){
- if (FirstOffset < 16 || FirstOffset > length-16){
+ if (FirstOffset < 16 || length < 16 || FirstOffset > length-16){
ErrNonfatal("invalid offset for first Exif IFD value",0,0);
return;
}

7
srcpkgs/jhead/template
View File

@ -1,18 +1,19 @@
# Template file for 'jhead' # Template file for 'jhead'
pkgname=jhead pkgname=jhead
version=3.00 version=3.02
revision=4 revision=1
build_style=gnu-makefile build_style=gnu-makefile
short_desc="Display and manipulate EXIF header of JPEG images" short_desc="Display and manipulate EXIF header of JPEG images"
maintainer="Oliver Kiddle <okiddle@yahoo.co.uk>" maintainer="Oliver Kiddle <okiddle@yahoo.co.uk>"
license="Public Domain" license="Public Domain"
homepage="http://www.sentex.net/~mwandel/jhead/" homepage="http://www.sentex.net/~mwandel/jhead/"
distfiles="${homepage}/jhead-${version}.tar.gz" distfiles="${homepage}/jhead-${version}.tar.gz"
checksum=88cc01da018e242fe2e05db73f91b6288106858dd70f27506c4989a575d2895e checksum=85c9737c3dcc84b440a67307de9f76cbee7610697bfaf4877dd46afd71c7ed2a
post_extract() { post_extract() {
sed -i -e 's,/local,,' -e '/CC.*-o/s/$/ $(LDFLAGS)/' makefile sed -i -e 's,/local,,' -e '/CC.*-o/s/$/ $(LDFLAGS)/' makefile
} }
pre_install() { pre_install() {
mkdir -p ${DESTDIR}/usr/bin mkdir -p ${DESTDIR}/usr/bin
vman jhead.1 vman jhead.1