# HG changeset patch
# User Carl Byington <carl@five-ten-sg.com>
# Date 1217480512 25200
# Node ID 582e927756d3643bc8444d5f25a2a41064c433e2
# Parent  49b1d7a6b2b412aca18cd5c6c938b10f12b5c392
Patch from Robert Simpson for file handle leak in error case.
Fix for missing length on lz decompression, bug found by Chris White.

diff -r 49b1d7a6b2b4 -r 582e927756d3 ChangeLog
--- a/ChangeLog	Sun Jun 15 07:00:54 2008 -0700
+++ b/ChangeLog	Wed Jul 30 22:01:52 2008 -0700
@@ -1,17 +1,21 @@
+LibPST 0.6.15 (2008-07-30)
+	* Patch from Robert Simpson for file handle leak in error case.
+	* Fix for missing length on lz decompression, bug found by Chris White.
+
 LibPST 0.6.14 (2008-06-15)
 ===============================
-	* Fix my mistake in debian packaging.
+        * Fix my mistake in debian packaging.
 
 LibPST 0.6.13 (2008-06-13)
 ===============================
-	* Patch from Robert Simpson for encryption type 2.
-	* Fix the order of testing item types to avoid claiming
-	there are multiple message stores.
+        * Patch from Robert Simpson for encryption type 2.
+        * Fix the order of testing item types to avoid claiming
+        there are multiple message stores.
 
 LibPST 0.6.12 (2008-06-10)
 ===============================
-	* Patch from Joachim Metz for debian packaging, and fix
-	for incorrect length on lz decompression.
+        * Patch from Joachim Metz for debian packaging, and fix
+        for incorrect length on lz decompression.
 
 LibPST 0.6.11 (2008-06-03)
 ===============================
@@ -23,9 +27,9 @@
 ===============================
         * Patch from Robert Simpson <rsimpson@idiscoverglobal.com>
         fix doubly-linked list in the cache_ptr code, and allow
-	arrays of unicode strings (without converting them).
+        arrays of unicode strings (without converting them).
         * More changes for Fedora packaging (#434727)
-	* Fixes for const correctness.
+        * Fixes for const correctness.
 
 LibPST 0.6.9 (2008-05-16)
 ===============================
diff -r 49b1d7a6b2b4 -r 582e927756d3 NEWS
--- a/NEWS	Sun Jun 15 07:00:54 2008 -0700
+++ b/NEWS	Wed Jul 30 22:01:52 2008 -0700
@@ -1,3 +1,4 @@
+0.6.15  2008-07-30 Fix file handle leak in error case, missing length on lz decompression.
 0.6.14  2008-06-15 Fix my mistake in debian packaging.
 0.6.13  2008-06-13 Patch from Robert Simpson for encryption type 2.
 0.6.12  2008-06-10 Patch from Joachim Metz for debian packaging, and fix for incorrect length on lz decompression.
diff -r 49b1d7a6b2b4 -r 582e927756d3 configure.in
--- a/configure.in	Sun Jun 15 07:00:54 2008 -0700
+++ b/configure.in	Wed Jul 30 22:01:52 2008 -0700
@@ -1,5 +1,5 @@
 AC_PREREQ(2.59)
-AC_INIT(libpst,0.6.14,carl@five-ten-sg.com)
+AC_INIT(libpst,0.6.15,carl@five-ten-sg.com)
 AC_CONFIG_SRCDIR([config.h.in])
 AC_CONFIG_HEADER([config.h])
 
diff -r 49b1d7a6b2b4 -r 582e927756d3 libpst.spec.in
--- a/libpst.spec.in	Sun Jun 15 07:00:54 2008 -0700
+++ b/libpst.spec.in	Wed Jul 30 22:01:52 2008 -0700
@@ -47,6 +47,10 @@
 
 
 %changelog
+* Wed Jul 30 2008 Carl Byington <carl@five-ten-sg.com> - 0.6.15-1
+- Patch from Robert Simpson for file handle leak in error case.
+- Fix for missing length on lz decompression, bug found by Chris White.
+
 * Sun Jun 15 2008 Carl Byington <carl@five-ten-sg.com> - 0.6.14-1
 - Fix my mistake in debian packaging.
 
diff -r 49b1d7a6b2b4 -r 582e927756d3 src/libpst.c
--- a/src/libpst.c	Sun Jun 15 07:00:54 2008 -0700
+++ b/src/libpst.c	Wed Jul 30 22:01:52 2008 -0700
@@ -202,6 +202,7 @@
             pf->do_read64 = 1;
             break;
         default:
+            (void)fclose(pf->fp);
             WARN(("unknown .pst format, possibly newer than Outlook 2003 PST file?\n"));
             DEBUG_RET();
             return -1;
diff -r 49b1d7a6b2b4 -r 582e927756d3 src/lzfu.c
--- a/src/lzfu.c	Sun Jun 15 07:00:54 2008 -0700
+++ b/src/lzfu.c	Wed Jul 30 22:01:52 2008 -0700
@@ -120,6 +120,6 @@
 			flag_mask <<= 1;
 		}
 	}
-	// the RTF data is terminated with }}\0\0
+    *size = out_ptr;
 	return out_buf;
 }