git-svn: trunk@605
Tomasz Kojm authored on 2004/06/13 02:28:46... | ... |
@@ -1,3 +1,10 @@ |
1 |
+Sat Jun 12 19:21:44 CEST 2004 (tk) |
|
2 |
+---------------------------------- |
|
3 |
+ * shared/cfgparser: freecfg: fix loop when some directives are doubled in |
|
4 |
+ config file (bug found by Ole Craig <olc*cs.umass.edu>) |
|
5 |
+ * libclamav: scanners: add 'X-Real-To: ' mail type (thanks to Andrey |
|
6 |
+ J. Melnikoff (TEMHOTA) <temnota*kmv.ru>) |
|
7 |
+ |
|
1 | 8 |
Sat Jun 12 17:32:31 CEST 2004 (tk) |
2 | 9 |
---------------------------------- |
3 | 10 |
* libclamav: fix problem with {set,init}groups on Windows SFU 3.5 (reported |
... | ... |
@@ -446,7 +446,7 @@ int cli_scanpe(int desc, const char **virname, long int *scanned, const struct c |
446 | 446 |
} |
447 | 447 |
|
448 | 448 |
if(upxfn(src, ssize, dest, dsize)) { |
449 |
- cli_dbg("UPX decompression failed\n"); |
|
449 |
+ cli_dbgmsg("UPX decompression failed\n"); |
|
450 | 450 |
} else { |
451 | 451 |
int ndesc; |
452 | 452 |
|
... | ... |
@@ -101,6 +101,7 @@ static const struct cli_magic_s cli_magic[] = { |
101 | 101 |
{0, "X-Original-To: ", 15, "Mail", CL_MAILFILE}, |
102 | 102 |
{0, "X-Symantec-", 11, "Symantec", CL_MAILFILE}, |
103 | 103 |
{0, "X-EVS", 5, "EVS mail", CL_MAILFILE}, |
104 |
+ {0, "X-Real-To: ", 11, "Mail", CL_MAILFILE}, |
|
104 | 105 |
{0, ">From ", 6, "Mail", CL_MAILFILE}, |
105 | 106 |
{0, "Date: ", 6, "Mail", CL_MAILFILE}, |
106 | 107 |
{0, "Message-Id: ", 12, "Mail", CL_MAILFILE}, |
... | ... |
@@ -238,14 +238,15 @@ void freecfg(struct cfgstruct *copt) |
238 | 238 |
|
239 | 239 |
while (copt) { |
240 | 240 |
arg = copt->nextarg; |
241 |
- while (arg) { |
|
241 |
+ while(arg) { |
|
242 | 242 |
if(arg->strarg) { |
243 | 243 |
free(arg->optname); |
244 | 244 |
free(arg->strarg); |
245 | 245 |
handler = arg; |
246 |
- arg=arg->nextarg; |
|
246 |
+ arg = arg->nextarg; |
|
247 | 247 |
free(handler); |
248 |
- } |
|
248 |
+ } else |
|
249 |
+ arg = arg->nextarg; |
|
249 | 250 |
} |
250 | 251 |
if(copt->optname) { |
251 | 252 |
free(copt->optname); |