Make sure we properly initialize ANY_t to NULL

This commit is contained in:
Harald Welte 2010-07-20 12:15:19 +02:00
parent facaed2396
commit bc10c80135
1 changed files with 5 additions and 6 deletions

View File

@ -76,7 +76,7 @@ int tcap_csl_tc_uni_req(struct tcap_dialogue *td, OBJECT_IDENTIFIER_t *app_ctx,
struct TCMessage *tcm;
ExternalPDU_t *ext;
UniDialoguePDU_t *dial;
ANY_t *any;
ANY_t *any = NULL;
ComponentPortion_t *pend_comp;
int rc;
@ -130,6 +130,7 @@ int tcap_csl_tc_begin_req(struct tcap_dialogue *td, OBJECT_IDENTIFIER_t *app_ctx
struct TCMessage *tcm;
ExternalPDU_t *ext;
DialoguePDU_t *dial;
ANY_t *any = NULL;
struct tcap_invocation *ti;
uint32_t trans_id;
int rc;
@ -139,7 +140,6 @@ int tcap_csl_tc_begin_req(struct tcap_dialogue *td, OBJECT_IDENTIFIER_t *app_ctx
if (app_ctx) {
AARQ_apdu_t *aarq;
ANY_t *any;
/* Build AARQ apdu */
any = talloc_zero(tcm, ANY_t);
@ -356,7 +356,7 @@ static ANY_t *gen_ext_AARE(struct tcap_dialogue *td, OBJECT_IDENTIFIER_t *app_ct
int tcap_csl_tc_cont_req(struct tcap_dialogue *td, OBJECT_IDENTIFIER_t *app_ctx, struct user_information *user_info)
{
struct TCMessage tcm;
ANY_t *any;
ANY_t *any = NULL;
uint32_t trans_id;
int rc = 0;
@ -408,7 +408,7 @@ int tcap_csl_tc_cont_req(struct tcap_dialogue *td, OBJECT_IDENTIFIER_t *app_ctx,
int tcap_csl_tc_end_req(struct tcap_dialogue *td, OBJECT_IDENTIFIER_t *app_ctx, struct user_information *user_info, int prearranged)
{
struct TCMessage tcm;
ANY_t *any;
ANY_t *any = NULL;
int rc = 0;
memset(&tcm, 0, sizeof(tcm));
@ -450,13 +450,12 @@ int tcap_csl_tc_end_req(struct tcap_dialogue *td, OBJECT_IDENTIFIER_t *app_ctx,
tcm.choice.end.components = tcap_cha_req_components(td);
/* TR-END.req to TSL */
rc = tcap_tco_tr_end_req(&td->trans, &tcm);
asn_DEF_ANY.free_struct(&asn_DEF_ANY, any, 0);
/* Dialogue terminated to CHA */
tcap_cha_dialg_term(td);
/* Free Dialogue ID */
tcap_dialg_free(td);
asn_DEF_ANY.free_struct(&asn_DEF_ANY, any, 0);
return rc;
}