Attachment 157628 Details for Bug 200176 – libarchive updates to address Sevan's reported issue

[patch] libarchive updates to address Sevan's reported issue

libarchive-3.1.2_3,1.diff (text/plain), 3.49 KB, created by Jason Unovitch on 2015-06-11 03:07:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jason Unovitch

Created: 2015-06-11 03:07:07 UTC

Size: 3.49 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 389147)
>+++ Makefile	(working copy)
>@@ -2,7 +2,7 @@
> 
> PORTNAME=	libarchive
> PORTVERSION=	3.1.2
>-PORTREVISION=	2
>+PORTREVISION=	3
> PORTEPOCH=	1
> CATEGORIES=	archivers
> MASTER_SITES=	http://libarchive.org/downloads/
>@@ -20,7 +20,6 @@
> USES=		cpe libtool pathfix
> GNU_CONFIGURE=	yes
> USE_LDCONFIG=	yes
>-PATCH_STRIP=	-p1
> 
> CONFIGURE_ARGS+=	--without-expat
> 
>Index: files/patch-libarchive_archive__read.c
>===================================================================
>--- files/patch-libarchive_archive__read.c	(revision 0)
>+++ files/patch-libarchive_archive__read.c	(working copy)
>@@ -0,0 +1,11 @@
>+--- libarchive/archive_read.c.orig	2015-06-11 02:33:58 UTC
>++++ libarchive/archive_read.c
>+@@ -1394,6 +1394,8 @@ __archive_read_filter_consume(struct arc
>+ {
>+ 	int64_t skipped;
>+ 
>++	if (request < 0)
>++		return ARCHIVE_FATAL;
>+ 	if (request == 0)
>+ 		return 0;
>+ 
>
>Property changes on: files/patch-libarchive_archive__read.c
>___________________________________________________________________
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Index: files/patch-libarchive_archive__read__support__format__cpio.c
>===================================================================
>--- files/patch-libarchive_archive__read__support__format__cpio.c	(revision 0)
>+++ files/patch-libarchive_archive__read__support__format__cpio.c	(working copy)
>@@ -0,0 +1,42 @@
>+--- libarchive/archive_read_support_format_cpio.c.orig	2013-01-14 01:43:45 UTC
>++++ libarchive/archive_read_support_format_cpio.c
>+@@ -198,7 +198,7 @@ static int	archive_read_format_cpio_read
>+ static int	archive_read_format_cpio_read_header(struct archive_read *,
>+ 		    struct archive_entry *);
>+ static int	archive_read_format_cpio_skip(struct archive_read *);
>+-static int	be4(const unsigned char *);
>++static int64_t	be4(const unsigned char *);
>+ static int	find_odc_header(struct archive_read *);
>+ static int	find_newc_header(struct archive_read *);
>+ static int	header_bin_be(struct archive_read *, struct cpio *,
>+@@ -213,7 +213,7 @@ static int	header_afiol(struct archive_r
>+ 		    struct archive_entry *, size_t *, size_t *);
>+ static int	is_octal(const char *, size_t);
>+ static int	is_hex(const char *, size_t);
>+-static int	le4(const unsigned char *);
>++static int64_t	le4(const unsigned char *);
>+ static int	record_hardlink(struct archive_read *a,
>+ 		    struct cpio *cpio, struct archive_entry *entry);
>+ 
>+@@ -944,17 +944,17 @@ archive_read_format_cpio_cleanup(struct 
>+ 	return (ARCHIVE_OK);
>+ }
>+ 
>+-static int
>++static int64_t
>+ le4(const unsigned char *p)
>+ {
>+-	return ((p[0]<<16) + (p[1]<<24) + (p[2]<<0) + (p[3]<<8));
>++	return ((p[0] << 16) + (((int64_t)p[1]) << 24) + (p[2] << 0) + (p[3] << 8));
>+ }
>+ 
>+ 
>+-static int
>++static int64_t
>+ be4(const unsigned char *p)
>+ {
>+-	return ((p[0]<<24) + (p[1]<<16) + (p[2]<<8) + (p[3]));
>++	return ((((int64_t)p[0]) << 24) + (p[1] << 16) + (p[2] << 8) + (p[3]));
>+ }
>+ 
>+ /*
>
>Property changes on: files/patch-libarchive_archive__read__support__format__cpio.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 200176: 157628