--- 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;

--- 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]));

 }

 /*