Merge lp:~yavor-nikolov/pbzip2/fix-bug-740502-hang-with-ignore-trailing-garbage into lp:pbzip2/1.1

[Yavor Nikolov]

Fixed hang on decompress with --ignore-trailing-garbage=1 and higher numCPU (e.g. > 2) (bug #740502)

[Yavor Nikolov (yavor-nikolov)]

Patch has also been confirmed as helpful on http://bugs.gentoo.org/show_bug.cgi?id=320313

review: Approve

=== modified file 'ChangeLog'
--- ChangeLog	2011-02-19 10:38:24 +0000
+++ ChangeLog	2011-03-27 13:47:27 +0000
@@ -1,4 +1,6 @@
 Changes in 1.1.3 (NOT RELEASED YET)
+- Fixed hang on decompress with --ignore-trailing-garbage=1 and higher
+  numCPU (e.g. > 2) (bug #740502)
 Changes in 1.1.2 (Feb 19, 2011)
 - Fix directdecompress segfault when destination file can't be
   opened (e.g. read-only) (bug #717852)

=== modified file 'pbzip2.cpp'
--- pbzip2.cpp	2011-02-19 10:38:24 +0000
+++ pbzip2.cpp	2011-03-27 13:47:27 +0000
@@ -187,6 +187,8 @@
  *                    - Fixed hang on decompress of some truncated archives (bug #590225).
  *                    - Implemented --ignore-trailing-garbage feature (bug #594868)
  *                    - Fixed hang on decompress of some truncated archives (bug #590225)
+ *                    - Fixed hang on decompress with --ignore-trailing-garbage=1 and higher
+ *                      numCPU (e.g. > 2) (bug #740502)
  *
  *
  *  Specials thanks for suggestions and testing:  Phillippe Welsh,
@@ -1387,6 +1389,7 @@
 		{
 			if (consumerDecompressCheckInterrupt(fileData) != 0)
 			{
+				safe_mutex_unlock(fifo->mut);
 				return (NULL);
 			}