fix memory leaks and cleanup clamav_plugin.c

diff --git a/ChangeLog.claws b/ChangeLog.claws
index b3913387a4d80948c8d8febad2d86932ffdf0fe0..155942c5c33a1ed8ebdc35df0d1a8ff2aaead78f 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,9 @@
+2003-04-13 [paul]      0.8.11claws88
+
+       * src/plugins/clamav/clamav_plugin.c
+               fix memory leaks
+               clean up
+
 2003-04-12 [paul]      0.8.11claws87
 
        * src/plugins/clamav/clamav_plugin.c

diff --git a/configure.ac b/configure.ac
index a3de32d0f5248e20e9b0ebf0d3150ecd83d2b396..bea699c86d4cf852f0aa13b028de04b2f761e200 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=11
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws87
+EXTRA_VERSION=claws88
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/plugins/clamav/clamav_plugin.c b/src/plugins/clamav/clamav_plugin.c
index 0d729b8dca785479193f1e9a6347e9476c90a6e0..e995f1510ea88c549f3c7cab219db6a35dc749f3 100644 (file)
--- a/src/plugins/clamav/clamav_plugin.c
+++ b/src/plugins/clamav/clamav_plugin.c
@@ -24,11 +24,6 @@
 #include "defs.h"
 
 #include <glib.h>
-
-#if HAVE_LOCALE_H
-#  include <locale.h>
-#endif
-
 #include <clamav.h>
 
 #include "common/plugin.h"
@@ -148,45 +143,48 @@ static gboolean mail_filtering_hook(gpointer source, gpointer data)
                        g_warning("Can't get the part of multipart message.");
                else {
                        debug_print("Scanning %s\n", outfile);
-                       if((ret = cl_scanfile(outfile, &virname, &size, root, 
+                       if ((ret = cl_scanfile(outfile, &virname, &size, root, 
                                              &limits, scan_archive)) == CL_VIRUS) {
                                is_infected = TRUE;
                                debug_print("Detected %s virus.\n", virname); 
                        } else {
                                debug_print("No virus detected.\n");
-                               if(ret != CL_CLEAN)
+                               if (ret != CL_CLEAN)
                                        debug_print("Error: %s\n", cl_perror(ret));
                        }
 
                        kb = size * (CL_COUNT_PRECISION / 1024);
                        debug_print("Data scanned: %2.2Lf Kb\n", kb);
     
-                       if (is_infected) {
-                               debug_print("message part(s) infected with %s\n", virname);
-                               if (config.clamav_receive_infected) {
-                                       FolderItem *clamav_save_folder;
-
-                                       if ((!config.clamav_save_folder) ||
-                                       (config.clamav_save_folder[0] == '\0') ||
-                                       ((clamav_save_folder = folder_find_item_from_identifier(config.clamav_save_folder)) == NULL))
-                                               clamav_save_folder = folder_get_default_trash();
-
-                                       procmsg_msginfo_unset_flags(msginfo, ~0, 0);
-                                       folder_item_move_msg(clamav_save_folder, msginfo);
-                               } else {
-                                       folder_item_remove_msg(msginfo->folder, msginfo->msgnum);
-                               }
-
-                               return TRUE;
-                       }
-                               child = child->next;
+                       unlink(outfile);
+
+                       if (is_infected) break;
+                       child = child->next;
+               }
+       }
+
+       if (is_infected) {
+               debug_print("message part(s) infected with %s\n", virname);
+               if (config.clamav_receive_infected) {
+                       FolderItem *clamav_save_folder;
+
+                       if ((!config.clamav_save_folder) ||
+                           (config.clamav_save_folder[0] == '\0') ||
+                           ((clamav_save_folder = folder_find_item_from_identifier(config.clamav_save_folder)) == NULL))
+                                   clamav_save_folder = folder_get_default_trash();
+
+                       procmsg_msginfo_unset_flags(msginfo, ~0, 0);
+                       folder_item_move_msg(clamav_save_folder, msginfo);
+               } else {
+                       folder_item_remove_msg(msginfo->folder, msginfo->msgnum);
                }
        }
+       
        cl_freetrie(root);
        g_free(infile);
        procmime_mimeinfo_free_all(mimeinfo);
-
-       return FALSE;
+       
+       return is_infected;
 }
 
 #undef IS_FIRST_PART_TEXT