svn commit: r382727 - /webservices/axis2/trunk/c/modules/util/dir_handler.c

[damitha]

Author: damitha
Date: Fri Mar  3 00:41:16 2006
New Revision: 382727

URL: http://svn.apache.org/viewcvs?rev=382727&view=rev
Log:
further memory leaks fixed which were due to scandir

Modified:
    webservices/axis2/trunk/c/modules/util/dir_handler.c

Modified: webservices/axis2/trunk/c/modules/util/dir_handler.c
URL: 
http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/util/dir_handler.c?rev=382727&r1=382726&r2=382727&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/util/dir_handler.c (original)
+++ webservices/axis2/trunk/c/modules/util/dir_handler.c Fri Mar  3 00:41:16 
2006
@@ -74,6 +74,7 @@
             }
             AXIS2_ARRAY_LIST_FREE(file_list, env);
             file_list = NULL;
+            AXIS2_FREE((*env)->allocator, *files);
             AXIS2_FREE((*env)->allocator, files);
             AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, 
AXIS2_FAILURE);
             return NULL;
@@ -99,6 +100,7 @@
             }
             AXIS2_ARRAY_LIST_FREE(file_list, env);
             file_list = NULL;
+            AXIS2_FREE((*env)->allocator, *files);
             AXIS2_FREE((*env)->allocator, files);
             AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, 
AXIS2_FAILURE);
             return NULL;
@@ -124,6 +126,7 @@
             }
             AXIS2_ARRAY_LIST_FREE(file_list, env);
             file_list = NULL;
+            AXIS2_FREE((*env)->allocator, *files);
             AXIS2_FREE((*env)->allocator, files);
             AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, 
AXIS2_FAILURE);
             return NULL;
@@ -151,6 +154,7 @@
             }
             AXIS2_ARRAY_LIST_FREE(file_list, env);
             file_list = NULL;
+            AXIS2_FREE((*env)->allocator, *files);
             AXIS2_FREE((*env)->allocator, files);
             return NULL;
         }
@@ -161,6 +165,7 @@
         arch_file = NULL;
         fname = NULL;
     }
+    AXIS2_FREE((*env)->allocator, *files);
     AXIS2_FREE((*env)->allocator, files);
     
     return file_list;
@@ -226,6 +231,7 @@
             }
             AXIS2_ARRAY_LIST_FREE(file_list, env);
             file_list = NULL;
+            AXIS2_FREE((*env)->allocator, *files);
             AXIS2_FREE((*env)->allocator, files);
             AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, 
AXIS2_FAILURE);
             return NULL;
@@ -251,6 +257,7 @@
             }
             AXIS2_ARRAY_LIST_FREE(file_list, env);
             file_list = NULL;
+            AXIS2_FREE((*env)->allocator, *files);
             AXIS2_FREE((*env)->allocator, files);
             AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, 
AXIS2_FAILURE);
             return NULL;
@@ -278,6 +285,7 @@
             }
             AXIS2_ARRAY_LIST_FREE(file_list, env);
             file_list = NULL;
+            AXIS2_FREE((*env)->allocator, *files);
             AXIS2_FREE((*env)->allocator, files);
             AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, 
AXIS2_FAILURE);
             return NULL;
@@ -306,6 +314,7 @@
             }
             AXIS2_ARRAY_LIST_FREE(file_list, env);
             file_list = NULL;
+            AXIS2_FREE((*env)->allocator, *files);
             AXIS2_FREE((*env)->allocator, files);
             return NULL;
             
@@ -317,6 +326,7 @@
         arch_file = NULL;
         fname = NULL;
     }
+    AXIS2_FREE((*env)->allocator, *files);
     AXIS2_FREE((*env)->allocator, files);
     
     return file_list;