Return-Path: Delivered-To: apmail-ws-axis-dev-archive@www.apache.org Received: (qmail 9342 invoked from network); 12 Jul 2007 07:58:55 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 12 Jul 2007 07:58:54 -0000 Received: (qmail 59843 invoked by uid 500); 12 Jul 2007 07:58:56 -0000 Delivered-To: apmail-ws-axis-dev-archive@ws.apache.org Received: (qmail 59743 invoked by uid 500); 12 Jul 2007 07:58:56 -0000 Mailing-List: contact axis-cvs-help@ws.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list axis-cvs@ws.apache.org Received: (qmail 59732 invoked by uid 500); 12 Jul 2007 07:58:56 -0000 Delivered-To: apmail-ws-axis2-cvs@ws.apache.org Received: (qmail 59729 invoked by uid 99); 12 Jul 2007 07:58:56 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 12 Jul 2007 00:58:56 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 12 Jul 2007 00:58:52 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id 93A6F1A981C; Thu, 12 Jul 2007 00:58:32 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r555520 - in /webservices/axis2/trunk/c/neethi/src: assertion.c policy.c secpolicy/model/property.c secpolicy/model/secpolicy.c Date: Thu, 12 Jul 2007 07:58:32 -0000 To: axis2-cvs@ws.apache.org From: manjula@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070712075832.93A6F1A981C@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: manjula Date: Thu Jul 12 00:58:31 2007 New Revision: 555520 URL: http://svn.apache.org/viewvc?view=rev&rev=555520 Log: Fixing tme memory leaks using ref count. Modified: webservices/axis2/trunk/c/neethi/src/assertion.c webservices/axis2/trunk/c/neethi/src/policy.c webservices/axis2/trunk/c/neethi/src/secpolicy/model/property.c webservices/axis2/trunk/c/neethi/src/secpolicy/model/secpolicy.c Modified: webservices/axis2/trunk/c/neethi/src/assertion.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/assertion.c?view=diff&rev=555520&r1=555519&r2=555520 ============================================================================== --- webservices/axis2/trunk/c/neethi/src/assertion.c (original) +++ webservices/axis2/trunk/c/neethi/src/assertion.c Thu Jul 12 00:58:31 2007 @@ -25,6 +25,9 @@ #include #include #include +#include +#include +#include struct neethi_assertion_t { @@ -133,6 +136,18 @@ rp_username_token_increment_ref((rp_username_token_t *)value, env); } + if(type == ASSERTION_TYPE_ASSYMMETRIC_BINDING) + { + rp_asymmetric_binding_increment_ref((rp_asymmetric_binding_t *)value, env); + } + if(type == ASSERTION_TYPE_SIGNED_ENCRYPTED_PARTS) + { + rp_signed_encrypted_parts_increment_ref((rp_signed_encrypted_parts_t *)value, env); + } + if(type == ASSERTION_TYPE_RAMPART_CONFIG) + { + rp_rampart_config_increment_ref((rp_rampart_config_t *)value, env); + } neethi_assertion->value = value; neethi_assertion->type = type; neethi_assertion->element = NULL; Modified: webservices/axis2/trunk/c/neethi/src/policy.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/policy.c?view=diff&rev=555520&r1=555519&r2=555520 ============================================================================== --- webservices/axis2/trunk/c/neethi/src/policy.c (original) +++ webservices/axis2/trunk/c/neethi/src/policy.c Thu Jul 12 00:58:31 2007 @@ -95,6 +95,16 @@ axutil_array_list_free(neethi_policy->policy_components , env); neethi_policy->policy_components = NULL; } + if(neethi_policy->id) + { + AXIS2_FREE(env->allocator, neethi_policy->id); + neethi_policy->id = NULL; + } + if(neethi_policy->name) + { + AXIS2_FREE(env->allocator, neethi_policy->name); + neethi_policy->name = NULL; + } AXIS2_FREE(env->allocator, neethi_policy); neethi_policy = NULL; } Modified: webservices/axis2/trunk/c/neethi/src/secpolicy/model/property.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/secpolicy/model/property.c?view=diff&rev=555520&r1=555519&r2=555520 ============================================================================== --- webservices/axis2/trunk/c/neethi/src/secpolicy/model/property.c (original) +++ webservices/axis2/trunk/c/neethi/src/secpolicy/model/property.c Thu Jul 12 00:58:31 2007 @@ -172,8 +172,19 @@ if(type == RP_SUPPORTING_SIGNED_SUPPORTING) { rp_supporting_tokens_increment_ref((rp_supporting_tokens_t *)value, env); + } + if(type == RP_BINDING_ASYMMETRIC) + { + rp_asymmetric_binding_increment_ref((rp_asymmetric_binding_t *)value, env); + } + if(type == RP_BINDING_TRANSPORT) + { + rp_transport_binding_increment_ref((rp_transport_binding_t *)value, env); + } + if(type == RP_BINDING_SYMMETRIC) + { + rp_symmetric_binding_increment_ref((rp_symmetric_binding_t *)value, env); } - property->value =(void *)value; return AXIS2_SUCCESS; Modified: webservices/axis2/trunk/c/neethi/src/secpolicy/model/secpolicy.c URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/secpolicy/model/secpolicy.c?view=diff&rev=555520&r1=555519&r2=555520 ============================================================================== --- webservices/axis2/trunk/c/neethi/src/secpolicy/model/secpolicy.c (original) +++ webservices/axis2/trunk/c/neethi/src/secpolicy/model/secpolicy.c Thu Jul 12 00:58:31 2007 @@ -80,70 +80,70 @@ { if(secpolicy->binding) { - rp_property_free(secpolicy->binding,env); + rp_property_free(secpolicy->binding, env); secpolicy->binding = NULL; } if(secpolicy->wss) { - rp_property_free(secpolicy->wss,env); + rp_property_free(secpolicy->wss, env); secpolicy->wss = NULL; } if(secpolicy->supporting_tokens) { - rp_supporting_tokens_free(secpolicy->supporting_tokens,env); + rp_supporting_tokens_free(secpolicy->supporting_tokens, env); secpolicy->supporting_tokens = NULL; } if(secpolicy->signed_supporting_tokens) { - rp_supporting_tokens_free(secpolicy->signed_supporting_tokens,env); + rp_supporting_tokens_free(secpolicy->signed_supporting_tokens, env); secpolicy->signed_supporting_tokens = NULL; } if(secpolicy->endorsing_supporting_tokens) { - rp_supporting_tokens_free(secpolicy->endorsing_supporting_tokens,env); + rp_supporting_tokens_free(secpolicy->endorsing_supporting_tokens, env); secpolicy->endorsing_supporting_tokens = NULL; } if(secpolicy->signed_endorsing_supporting_tokens) { - rp_supporting_tokens_free(secpolicy->signed_endorsing_supporting_tokens,env); + rp_supporting_tokens_free(secpolicy->signed_endorsing_supporting_tokens, env); secpolicy->signed_endorsing_supporting_tokens = NULL; } if(secpolicy->signed_parts) { - rp_signed_encrypted_parts_free(secpolicy->signed_parts,env); + rp_signed_encrypted_parts_free(secpolicy->signed_parts, env); secpolicy->signed_parts = NULL; } if(secpolicy->encrypted_parts) { - rp_signed_encrypted_parts_free(secpolicy->encrypted_parts,env); + rp_signed_encrypted_parts_free(secpolicy->encrypted_parts, env); secpolicy->encrypted_parts = NULL; } if(secpolicy->signed_elements) { - rp_signed_encrypted_elements_free(secpolicy->signed_elements,env); + rp_signed_encrypted_elements_free(secpolicy->signed_elements, env); secpolicy->signed_elements = NULL; } if(secpolicy->encrypted_elements) { - rp_signed_encrypted_elements_free(secpolicy->encrypted_elements,env); + rp_signed_encrypted_elements_free(secpolicy->encrypted_elements, env); secpolicy->encrypted_elements = NULL; } if(secpolicy->signed_items) { - rp_signed_encrypted_items_free(secpolicy->signed_items,env); + rp_signed_encrypted_items_free(secpolicy->signed_items, env); secpolicy->signed_items = NULL; } if(secpolicy->encrypted_items) { - rp_signed_encrypted_items_free(secpolicy->encrypted_items,env); + rp_signed_encrypted_items_free(secpolicy->encrypted_items, env); secpolicy->encrypted_items = NULL; } if(secpolicy->rampart_config) { - rp_rampart_config_free(secpolicy->rampart_config,env); + rp_rampart_config_free(secpolicy->rampart_config, env); secpolicy->rampart_config = NULL; } - AXIS2_FREE(env->allocator,secpolicy); + AXIS2_FREE(env->allocator, secpolicy); } return; @@ -168,8 +168,8 @@ rp_property_t *binding) { AXIS2_ENV_CHECK(env, AXIS2_FAILURE); - AXIS2_PARAM_CHECK(env->error,binding,AXIS2_FAILURE); - + AXIS2_PARAM_CHECK(env->error, binding, AXIS2_FAILURE); + rp_property_increment_ref(binding, env); secpolicy->binding = binding; return AXIS2_SUCCESS; } @@ -182,7 +182,8 @@ { AXIS2_ENV_CHECK(env, AXIS2_FAILURE); AXIS2_PARAM_CHECK(env->error,supporting_tokens,AXIS2_FAILURE); - + + rp_supporting_tokens_increment_ref(supporting_tokens, env); secpolicy->supporting_tokens = supporting_tokens; return AXIS2_SUCCESS; } @@ -206,6 +207,7 @@ AXIS2_ENV_CHECK(env, AXIS2_FAILURE); AXIS2_PARAM_CHECK(env->error,signed_supporting_tokens,AXIS2_FAILURE); + rp_supporting_tokens_increment_ref(signed_supporting_tokens, env); secpolicy->signed_supporting_tokens = signed_supporting_tokens; return AXIS2_SUCCESS; } @@ -227,8 +229,9 @@ rp_supporting_tokens_t *endorsing_supporting_tokens) { AXIS2_ENV_CHECK(env, AXIS2_FAILURE); - AXIS2_PARAM_CHECK(env->error,endorsing_supporting_tokens,AXIS2_FAILURE); + AXIS2_PARAM_CHECK(env->error, endorsing_supporting_tokens, AXIS2_FAILURE); + rp_supporting_tokens_increment_ref(endorsing_supporting_tokens, env); secpolicy->endorsing_supporting_tokens = endorsing_supporting_tokens; return AXIS2_SUCCESS; } @@ -250,8 +253,9 @@ rp_supporting_tokens_t *signed_endorsing_supporting_tokens) { AXIS2_ENV_CHECK(env, AXIS2_FAILURE); - AXIS2_PARAM_CHECK(env->error,signed_endorsing_supporting_tokens,AXIS2_FAILURE); + AXIS2_PARAM_CHECK(env->error, signed_endorsing_supporting_tokens, AXIS2_FAILURE); + rp_supporting_tokens_increment_ref(signed_endorsing_supporting_tokens, env); secpolicy->signed_endorsing_supporting_tokens = signed_endorsing_supporting_tokens; return AXIS2_SUCCESS; } @@ -273,7 +277,8 @@ rp_signed_encrypted_parts_t *signed_parts) { AXIS2_ENV_CHECK(env, AXIS2_FAILURE); - AXIS2_PARAM_CHECK(env->error,signed_parts,AXIS2_FAILURE); + AXIS2_PARAM_CHECK(env->error, signed_parts, AXIS2_FAILURE); + rp_signed_encrypted_parts_increment_ref(signed_parts, env); secpolicy->signed_parts = signed_parts; return AXIS2_SUCCESS; @@ -297,8 +302,9 @@ rp_signed_encrypted_parts_t *encrypted_parts) { AXIS2_ENV_CHECK(env, AXIS2_FAILURE); - AXIS2_PARAM_CHECK(env->error,encrypted_parts,AXIS2_FAILURE); + AXIS2_PARAM_CHECK(env->error, encrypted_parts, AXIS2_FAILURE); + rp_signed_encrypted_parts_increment_ref(encrypted_parts, env); secpolicy->encrypted_parts = encrypted_parts; return AXIS2_SUCCESS; @@ -321,8 +327,9 @@ rp_signed_encrypted_elements_t *signed_elements) { AXIS2_ENV_CHECK(env, AXIS2_FAILURE); - AXIS2_PARAM_CHECK(env->error,signed_elements,AXIS2_FAILURE); + AXIS2_PARAM_CHECK(env->error, signed_elements, AXIS2_FAILURE); + rp_signed_encrypted_elements_increment_ref(signed_elements, env); secpolicy->signed_elements = signed_elements; return AXIS2_SUCCESS; @@ -345,8 +352,9 @@ rp_signed_encrypted_elements_t *encrypted_elements) { AXIS2_ENV_CHECK(env, AXIS2_FAILURE); - AXIS2_PARAM_CHECK(env->error,encrypted_elements,AXIS2_FAILURE); + AXIS2_PARAM_CHECK(env->error, encrypted_elements, AXIS2_FAILURE); + rp_signed_encrypted_elements_increment_ref(encrypted_elements, env); secpolicy->encrypted_elements = encrypted_elements; return AXIS2_SUCCESS; } @@ -415,8 +423,9 @@ rp_property_t *wss) { AXIS2_ENV_CHECK(env, AXIS2_FAILURE); - AXIS2_PARAM_CHECK(env->error,wss,AXIS2_FAILURE); + AXIS2_PARAM_CHECK(env->error, wss, AXIS2_FAILURE); + rp_property_increment_ref(wss, env); secpolicy->wss = wss; return AXIS2_SUCCESS; } @@ -438,8 +447,9 @@ rp_rampart_config_t *rampart_config) { AXIS2_ENV_CHECK(env, AXIS2_FAILURE); - AXIS2_PARAM_CHECK(env->error,rampart_config,AXIS2_FAILURE); + AXIS2_PARAM_CHECK(env->error, rampart_config, AXIS2_FAILURE); + rp_rampart_config_increment_ref(rampart_config, env); secpolicy->rampart_config = rampart_config; return AXIS2_SUCCESS; } --------------------------------------------------------------------- To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org For additional commands, e-mail: axis-cvs-help@ws.apache.org