From: Kern Sibbald <kern@sibbald.com>
Date: Mon, 7 Mar 2011 16:01:25 +0000 (+0100)
Subject: Fix bug #1703 unable to bextract compressed files
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=db06e0d88fa1c98d72ea139ae9d1d8568e9b424a;p=bacula%2Fbacula

Fix bug #1703 unable to bextract compressed files
---

diff --git a/bacula/src/stored/bextract.c b/bacula/src/stored/bextract.c
index fde9a99b26..ca65673e6c 100644
--- a/bacula/src/stored/bextract.c
+++ b/bacula/src/stored/bextract.c
@@ -410,7 +410,7 @@ static bool record_cb(DCR *dcr, DEV_RECORD *rec)
    case STREAM_WIN32_GZIP_DATA:
 #ifdef HAVE_LIBZ
       if (extract) {
-         uLong compress_len;
+         uLong compress_len = compress_buf_size;
          int stat;
 
          if (rec->maskedStream == STREAM_SPARSE_GZIP_DATA) {
@@ -436,11 +436,10 @@ static bool record_cb(DCR *dcr, DEV_RECORD *rec)
             wsize = rec->data_len;
          }
 
-         while ((stat=uncompress((Byte *)compress_buf, &compress_len,
-                                 (const Byte *)wbuf, (uLong)wsize)) == Z_BUF_ERROR)
-         {
+         while (compress_len < 10000000 && (stat=uncompress((Byte *)compress_buf, &compress_len,
+                                 (const Byte *)wbuf, (uLong)wsize)) == Z_BUF_ERROR) {
             /* The buffer size is too small, try with a bigger one */
-            compress_len = compress_len + (compress_len >> 1);
+            compress_len = 2 * compress_len;
             compress_buf = check_pool_memory_size(compress_buf,
                                                   compress_len);
          }