Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 22 Sep 2017 19:00:41 +0000 (UTC)
From:      Oliver Lehmann <oliver@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r450398 - in head/devel/physfs: . files
Message-ID:  <201709221900.v8MJ0fmI098254@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: oliver
Date: Fri Sep 22 19:00:41 2017
New Revision: 450398
URL: https://svnweb.freebsd.org/changeset/ports/450398

Log:
  Fix bug with copying z_stream objects around in zip archiver
  
  PR:             217526
  Submitted by:   Ryan C. Gordon <icculus@icculus.org>
  Reported by:    Thibault Payet

Added:
  head/devel/physfs/files/
  head/devel/physfs/files/patch-archivers_zip.c   (contents, props changed)
Modified:
  head/devel/physfs/Makefile

Modified: head/devel/physfs/Makefile
==============================================================================
--- head/devel/physfs/Makefile	Fri Sep 22 18:31:56 2017	(r450397)
+++ head/devel/physfs/Makefile	Fri Sep 22 19:00:41 2017	(r450398)
@@ -3,6 +3,7 @@
 
 PORTNAME=	physfs
 PORTVERSION=	2.0.3
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://icculus.org/${PORTNAME}/downloads/
 

Added: head/devel/physfs/files/patch-archivers_zip.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/physfs/files/patch-archivers_zip.c	Fri Sep 22 19:00:41 2017	(r450398)
@@ -0,0 +1,12 @@
+--- archivers/zip.c.orig	2017-03-03 22:21:13 UTC
++++ archivers/zip.c
+@@ -327,7 +327,8 @@ static int ZIP_seek(fvoid *opaque, PHYSF
+                 return(0);
+ 
+             inflateEnd(&finfo->stream);
+-            memcpy(&finfo->stream, &str, sizeof (z_stream));
++            inflateCopy(&finfo->stream, &str);
++            inflateEnd(&str);
+             finfo->uncompressed_position = finfo->compressed_position = 0;
+         } /* if */
+ 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201709221900.v8MJ0fmI098254>