Merge 0.10.1 into head.
Bump head version to 0.10b to diffentiate bugfixed version.

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c829422..980eb77 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,7 +20,7 @@
 SET(PACKAGE_NAME ${PACKAGE})
 SET(PACKAGE_VERSION_MAJOR "0")
 SET(PACKAGE_VERSION_MINOR "10")
-SET(PACKAGE_VERSION_PATCH "a")
+SET(PACKAGE_VERSION_PATCH "b")
 SET(VERSION "${PACKAGE_VERSION_MAJOR}.${PACKAGE_VERSION_MINOR}.${PACKAGE_VERSION_PATCH}")
 SET(PACKAGE_VERSION ${VERSION})
 SET(PACKAGE_STRING "${PACKAGE_NAME} ${PACKAGE_VERSION}")

NEWS

diff --git a/NEWS b/NEWS
index 122cdf4..c9923a9 100644
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,10 @@
 * More changes for Windows support
 * Additional test cases
 
+0.10.1 [2012/03/20]
+* Fixed CVE-2012-1162
+* Fixed CVE-2012-1163
+
 0.10 [2010/03/18]
 
 * Added zip_get_num_files(), deprecated zip_get_num_entries().

THANKS

diff --git a/THANKS b/THANKS
index 9665b7b..3cd6610 100644
--- a/THANKS
+++ b/THANKS
@@ -20,5 +20,6 @@
 Simon Talbot <simont@nse.co.uk>
 Stephen Bryant <steve@bawue.de>
 Tarmo Pikaro <tapika@yahoo.com>
+Timo Warns <warns@pre-sense.de>
 Tom Callaway <tcallawa@redhat.com>
 Vassili Courzakis <vcoxvco@googlemail.com>

configure.ac

diff --git a/configure.ac b/configure.ac
index 0f847a7..6e72ecb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
 AC_PREREQ(2.57)
-AC_INIT([libzip],[0.10a],[libzip-discuss@nih.at])
+AC_INIT([libzip],[0.10b],[libzip-discuss@nih.at])
 AC_CONFIG_SRCDIR([lib/zip_add.c])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_MACRO_DIR([m4])

lib/zip_open.c

diff --git a/lib/zip_open.c b/lib/zip_open.c
index f69c07a..7aebdd3 100644
--- a/lib/zip_open.c
+++ b/lib/zip_open.c
@@ -212,7 +212,7 @@
     cd->comment = NULL;
     cd->comment_len = _zip_read2(&cdp);
 
-    if (cd->offset+cd->size > buf_offset + (eocd-buf)) {
+    if (((zip_uint64_t)cd->offset)+cd->size > buf_offset + (eocd-buf)) {
 	/* cdir spans past EOCD record */
 	_zip_error_set(error, ZIP_ER_INCONS, 0);
 	cd->nentry = 0;