Imported Upstream version 1.3.2

Change-Id: I29645646cd0cfe9ac99302088a8727c98fde7b45
Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>

diff --git a/.hgtags b/.hgtags
index 9369ff4..fc0a088 100644 (file)
--- a/.hgtags
+++ b/.hgtags
@@ -21,3 +21,7 @@ aefb3263e2449b0b62095b2e50e9010d073fb670 s
 0000000000000000000000000000000000000000 s
 c43a9681c5ca2d577636a75dc1f29b384c82f51a rel-1-2-0
 1863a86ceda84a68b6eba34dfff5fc15f1f65ea8 rel-1-3-0
+6e80ae292bc56c1749d26a1ba20e8e4c8c036fe5 rel-1-3-1
+d5963473a0bac25adca83505cb6ac701538b53b6 rel-1-3-2
+d5963473a0bac25adca83505cb6ac701538b53b6 rel-1-3-2
+0000000000000000000000000000000000000000 rel-1-3-2

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 624f997..deceb65 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,7 +20,7 @@ SET(PACKAGE "libzip")
 SET(PACKAGE_NAME ${PACKAGE})
 SET(PACKAGE_VERSION_MAJOR "1")
 SET(PACKAGE_VERSION_MINOR "3")
-SET(PACKAGE_VERSION_PATCH "1")
+SET(PACKAGE_VERSION_PATCH "2")
 #SET(VERSION "${PACKAGE_VERSION_MAJOR}.${PACKAGE_VERSION_MINOR}")
 SET(VERSION "${PACKAGE_VERSION_MAJOR}.${PACKAGE_VERSION_MINOR}.${PACKAGE_VERSION_PATCH}")
 SET(PACKAGE_VERSION ${VERSION})

diff --git a/Makefile.am b/Makefile.am
index 3caa26f..f8d487f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,7 +20,7 @@ EXTRA_DIST=   API-CHANGES \
                libzip.pc.in \
                m4
 
-dist-hook:
+not-dist-hook:
        mkdir $(distdir)/xcode
        mkdir $(distdir)/xcode/libzip.xcodeproj
        mkdir $(distdir)/xcode/libzip.xcodeproj/project.xcworkspace

diff --git a/NEWS.md b/NEWS.md
index 2ee8bba..400e867 100644 (file)
--- a/NEWS.md
+++ b/NEWS.md
@@ -1,3 +1,7 @@
+1.3.2 [2017-11-20]
+==================
+* Fix bug introduced in last: zip_t was erroneously freed if zip_close() failed.
+
 1.3.1 [2017-11-19]
 ==================
 

diff --git a/configure.ac b/configure.ac
index 76e3bd0..fe54a18 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ([2.60])
-AC_INIT([libzip],[1.3.1],[libzip@nih.at])
+AC_INIT([libzip],[1.3.2],[libzip@nih.at])
 AC_CONFIG_SRCDIR([lib/zip_add.c])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])

diff --git a/lib/zip_close.c b/lib/zip_close.c
index 71f4bf7..2aff0dd 100644 (file)
--- a/lib/zip_close.c
+++ b/lib/zip_close.c
@@ -216,15 +216,16 @@ zip_close(zip_t *za)
        }
     }
 
+    _zip_progress_end(za->progress);
+
     if (error) {
        zip_source_rollback_write(za->src);
+        return -1;
     }
 
-    _zip_progress_end(za->progress);
-
     zip_discard(za);
-    
-    return error ? -1 : 0;
+
+    return 0;
 }
 
 

diff --git a/xcode/config.h b/xcode/config.h
index fd0e6bb..a9fdc39 100644 (file)
--- a/xcode/config.h
+++ b/xcode/config.h
@@ -157,7 +157,7 @@
 #define PACKAGE_URL ""
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "1.3.1"
+#define PACKAGE_VERSION "1.3.1a"
 
 /* The size of `int', as computed by sizeof. */
 #define SIZEOF_INT 4
@@ -192,7 +192,7 @@
 /* #undef TM_IN_SYS_TIME */
 
 /* Version number of package */
-#define VERSION "1.3.0a"
+#define VERSION "1.3.1a"
 
 /* Enable large inode numbers on Mac OS X 10.5.  */
 #ifndef _DARWIN_USE_64_BIT_INODE