git-svn-id: file:///var/lib/svn/clamav-devel/trunk/clamav-devel@914 77e5149b-7576-45b1-b177-96237e5ba77b
Nigel Horne authored on 2004/09/21 18:28:28... | ... |
@@ -1,3 +1,8 @@ |
1 |
+Tue Sep 21 10:27:29 BST 2004 (njh) |
|
2 |
+---------------------------------- |
|
3 |
+ * libclamav/blob.c: When built with "--enable-debug", closing a closed blob |
|
4 |
+ is no longer fatal |
|
5 |
+ |
|
1 | 6 |
Tue Sep 21 09:15:48 BST 2004 (njh) |
2 | 7 |
---------------------------------- |
3 | 8 |
* libclamav/mbox.c: Now compiles in machines with libcurl but without |
... | ... |
@@ -32,12 +37,12 @@ Mon Sep 20 10:44:35 BST 2004 (trog) |
32 | 32 |
Mon Sep 20 10:09:55 BST 2004 (njh) |
33 | 33 |
---------------------------------- |
34 | 34 |
* clamav-milter: Change to clamd.conf |
35 |
- Remove StreamSaveToDisk check |
|
35 |
+ Remove StreamSaveToDisk check |
|
36 | 36 |
|
37 | 37 |
Mon Sep 20 09:32:05 BST 2004 (njh) |
38 | 38 |
---------------------------------- |
39 | 39 |
* libclamav/mbox.c: FOLLOWURLS is now compiled by default if libcurl |
40 |
- is found |
|
40 |
+ is found |
|
41 | 41 |
|
42 | 42 |
Mon Sep 20 01:44:47 CEST 2004 (tk) |
43 | 43 |
---------------------------------- |
... | ... |
@@ -16,6 +16,9 @@ |
16 | 16 |
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
17 | 17 |
* |
18 | 18 |
* $Log: blob.c,v $ |
19 |
+ * Revision 1.23 2004/09/21 09:26:35 nigelhorne |
|
20 |
+ * Closing a closed blob is no longer fatal |
|
21 |
+ * |
|
19 | 22 |
* Revision 1.22 2004/09/18 14:59:26 nigelhorne |
20 | 23 |
* Code tidy |
21 | 24 |
* |
... | ... |
@@ -68,7 +71,7 @@ |
68 | 68 |
* Change LOG to Log |
69 | 69 |
* |
70 | 70 |
*/ |
71 |
-static char const rcsid[] = "$Id: blob.c,v 1.22 2004/09/18 14:59:26 nigelhorne Exp $"; |
|
71 |
+static char const rcsid[] = "$Id: blob.c,v 1.23 2004/09/21 09:26:35 nigelhorne Exp $"; |
|
72 | 72 |
|
73 | 73 |
#if HAVE_CONFIG_H |
74 | 74 |
#include "clamav-config.h" |
... | ... |
@@ -287,7 +290,11 @@ blobClose(blob *b) |
287 | 287 |
{ |
288 | 288 |
assert(b != NULL); |
289 | 289 |
assert(b->magic == BLOB); |
290 |
- assert(!(b->isClosed)); |
|
290 |
+ |
|
291 |
+ if(b->isClosed) { |
|
292 |
+ cli_dbgmsg("Attempt to close a previously closed blob\n"); |
|
293 |
+ return; |
|
294 |
+ } |
|
291 | 295 |
|
292 | 296 |
/* |
293 | 297 |
* Nothing more is going to be added to this blob. If it'll save more |