git-svn: trunk@3736
aCaB authored on 2008/03/22 08:03:29... | ... |
@@ -1,3 +1,8 @@ |
1 |
+Fri Mar 21 23:14:31 CET 2008 (acab) |
|
2 |
+----------------------------------- |
|
3 |
+ * libclamav/nsis: only insists to unpack for LZMA |
|
4 |
+ partially reverts r3705 - bb#8888 |
|
5 |
+ |
|
1 | 6 |
Fri Mar 21 03:31:16 CET 2008 (acab) |
2 | 7 |
----------------------------------- |
3 | 8 |
* libclamav/nsis/bzip2: sync to upstream 1.0.5 |
... | ... |
@@ -135,8 +135,7 @@ static void nsis_shutdown(struct nsis_st *n) { |
135 | 135 |
} |
136 | 136 |
|
137 | 137 |
static int nsis_decomp(struct nsis_st *n) { |
138 |
- /* int ret = CL_EFORMAT; */ |
|
139 |
- int ret = CL_SUCCESS; /* unpack broken files too - bb#873 */ |
|
138 |
+ int ret = CL_EFORMAT; |
|
140 | 139 |
switch(n->comp) { |
141 | 140 |
case COMP_BZIP2: |
142 | 141 |
n->bz.avail_in = n->nsis.avail_in; |
... | ... |
@@ -156,6 +155,7 @@ static int nsis_decomp(struct nsis_st *n) { |
156 | 156 |
n->nsis.next_out = n->bz.next_out; |
157 | 157 |
break; |
158 | 158 |
case COMP_LZMA: |
159 |
+ ret = CL_SUCCESS; /* unpack broken files too - bb#873 - only for lzma - bb#888 - if it breaks once more i'm reverting everything */ |
|
159 | 160 |
switch (cli_LzmaDecode(&n->lz, &n->nsis)) { |
160 | 161 |
case LZMA_RESULT_OK: |
161 | 162 |
ret = CL_SUCCESS; |