You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by sa...@apache.org on 2006/01/13 05:21:05 UTC

svn commit: r368583 - in /webservices/axis2/trunk/c/modules/core/deployment: dep_engine.c ws_info_list.c

Author: samisa
Date: Thu Jan 12 20:20:59 2006
New Revision: 368583

URL: http://svn.apache.org/viewcvs?rev=368583&view=rev
Log:
Fixed some more memory allocation related bugs

Modified:
    webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c
    webservices/axis2/trunk/c/modules/core/deployment/ws_info_list.c

Modified: webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c?rev=368583&r1=368582&r2=368583&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/dep_engine.c Thu Jan 12 20:20:59 2006
@@ -292,6 +292,12 @@
     engine_impl->folder_name = NULL;
     engine_impl->conf_name = NULL; 
     engine_impl->dep_engine.ops = NULL;
+
+    engine_impl->ws_to_deploy = axis2_array_list_create(env, 10);
+    if (!(engine_impl->ws_to_deploy))
+    {
+        return NULL;
+    }
     
     engine_impl->dep_engine.ops = (axis2_dep_engine_ops_t *) AXIS2_MALLOC(
         (*env)->allocator, sizeof(axis2_dep_engine_ops_t));
@@ -299,6 +305,7 @@
 	if(NULL == engine_impl->dep_engine.ops)
 	{
         AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+        axis2_dep_engine_free(&(engine_impl->dep_engine), env);
         return NULL;
 	}
     

Modified: webservices/axis2/trunk/c/modules/core/deployment/ws_info_list.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/deployment/ws_info_list.c?rev=368583&r1=368582&r2=368583&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/deployment/ws_info_list.c (original)
+++ webservices/axis2/trunk/c/modules/core/deployment/ws_info_list.c Thu Jan 12 20:20:59 2006
@@ -124,6 +124,14 @@
         return NULL;
     }
     
+    ws_info_list_impl->current_info_lists = axis2_array_list_create(env, 10);
+    if (!(ws_info_list_impl->current_info_lists))
+    {
+        axis2_ws_info_list_free(&(ws_info_list_impl->ws_info_list), env);
+        AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
+        return NULL;
+    }
+    
 	ws_info_list_impl->ws_info_list.ops = 
 		AXIS2_MALLOC ((*env)->allocator, sizeof(axis2_ws_info_list_ops_t));
 	if(NULL == ws_info_list_impl->ws_info_list.ops)