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/21 01:20:00 UTC
svn commit: r370937 - in
/webservices/axis2/trunk/c/modules/core/description: svc_grp.c
transport_in_desc.c transport_out_desc.c
Author: samisa
Date: Fri Jan 20 16:19:53 2006
New Revision: 370937
URL: http://svn.apache.org/viewcvs?rev=370937&view=rev
Log:
Fixd bugs to prevent seg faults
Modified:
webservices/axis2/trunk/c/modules/core/description/svc_grp.c
webservices/axis2/trunk/c/modules/core/description/transport_in_desc.c
webservices/axis2/trunk/c/modules/core/description/transport_out_desc.c
Modified: webservices/axis2/trunk/c/modules/core/description/svc_grp.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/svc_grp.c?rev=370937&r1=370936&r2=370937&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/svc_grp.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/svc_grp.c Fri Jan 20 16:19:53 2006
@@ -320,12 +320,13 @@
AXIS2_ARRAY_LIST_FREE(svc_grp_impl->module_list, env);
svc_grp_impl->module_list = NULL;
}
-
+
+ /* Samisa: parenet should not be freed here.
if(NULL != svc_grp_impl->parent)
{
AXIS2_CONF_FREE(svc_grp_impl->parent, env);
svc_grp_impl->parent = NULL;
- }
+ }*/
if(NULL != svc_grp_impl)
{
Modified: webservices/axis2/trunk/c/modules/core/description/transport_in_desc.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/transport_in_desc.c?rev=370937&r1=370936&r2=370937&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/transport_in_desc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/transport_in_desc.c Fri Jan 20 16:19:53 2006
@@ -25,9 +25,6 @@
{
axis2_transport_in_desc_t transport_in;
- /** Field paramInclude */
- struct axis2_param_container *param_container;
-
/**
* Field flowInclude
* This will have a shallow copy and will not be freed by the descructor
@@ -143,7 +140,6 @@
return NULL;
}
- transport_in_impl->param_container = NULL;
transport_in_impl->qname = NULL;
transport_in_impl->in_phase = NULL;
transport_in_impl->faultphase = NULL;
@@ -151,9 +147,10 @@
transport_in_impl->faultflow = NULL;
transport_in_impl->recv = NULL;
transport_in_impl->transport_in.ops = NULL;
+ transport_in_impl->transport_in.param_container = NULL;
- transport_in_impl->param_container = axis2_param_container_create(env);
- if(NULL == transport_in_impl->param_container)
+ transport_in_impl->transport_in.param_container = axis2_param_container_create(env);
+ if(NULL == transport_in_impl->transport_in.param_container)
{
axis2_transport_in_desc_free(&(transport_in_impl->transport_in), env);
AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -219,10 +216,10 @@
transport_in->ops = NULL;
}
- if(NULL != transport_in_impl->param_container)
+ if(NULL != transport_in_impl->transport_in.param_container)
{
- AXIS2_PARAM_CONTAINER_FREE(transport_in_impl->param_container, env);
- transport_in_impl->param_container = NULL;
+ AXIS2_PARAM_CONTAINER_FREE(transport_in_impl->transport_in.param_container, env);
+ transport_in_impl->transport_in.param_container = NULL;
}
if(NULL != transport_in_impl->qname)
Modified: webservices/axis2/trunk/c/modules/core/description/transport_out_desc.c
URL: http://svn.apache.org/viewcvs/webservices/axis2/trunk/c/modules/core/description/transport_out_desc.c?rev=370937&r1=370936&r2=370937&view=diff
==============================================================================
--- webservices/axis2/trunk/c/modules/core/description/transport_out_desc.c (original)
+++ webservices/axis2/trunk/c/modules/core/description/transport_out_desc.c Fri Jan 20 16:19:53 2006
@@ -25,9 +25,6 @@
{
axis2_transport_out_desc_t transport_out;
- /** Field paramInclude */
- struct axis2_param_container *param_container;
-
/**
* Field flowInclude
* This will have a shallow copy and will not be freed by the descructor
@@ -143,7 +140,6 @@
return NULL;
}
- transport_out_impl->param_container = NULL;
transport_out_impl->qname = NULL;
transport_out_impl->out_phase = NULL;
transport_out_impl->faultphase = NULL;
@@ -151,9 +147,10 @@
transport_out_impl->faultflow = NULL;
transport_out_impl->sender = NULL;
transport_out_impl->transport_out.ops = NULL;
+ transport_out_impl->transport_out.param_container = NULL;
- transport_out_impl->param_container = axis2_param_container_create(env);
- if(NULL == transport_out_impl->param_container)
+ transport_out_impl->transport_out.param_container = axis2_param_container_create(env);
+ if(NULL == transport_out_impl->transport_out.param_container)
{
axis2_transport_out_desc_free(&(transport_out_impl->transport_out), env);
AXIS2_ERROR_SET((*env)->error, AXIS2_ERROR_NO_MEMORY, AXIS2_FAILURE);
@@ -219,10 +216,10 @@
transport_out->ops = NULL;
}
- if(NULL != transport_out_impl->param_container)
+ if(NULL != transport_out_impl->transport_out.param_container)
{
- AXIS2_PARAM_CONTAINER_FREE(transport_out_impl->param_container, env);
- transport_out_impl->param_container = NULL;
+ AXIS2_PARAM_CONTAINER_FREE(transport_out_impl->transport_out.param_container, env);
+ transport_out_impl->transport_out.param_container = NULL;
}
if(NULL != transport_out_impl->qname)