[sr-dev] git:5.0:fdb4538e: topos: free empty db results

Module: kamailio Branch: 5.0 Commit: fdb4538e02df824e946afb071aa708f6671586a1 URL: https://github.com/kamailio/kamailio/commit/fdb4538e02df824e946afb071aa708f… Author: Daniel-Constantin Mierla &lt;miconda(a)gmail.com&gt; Committer: Daniel-Constantin Mierla &lt;miconda(a)gmail.com&gt; Date: 2017-04-21T22:19:09+02:00 topos: free empty db results - root structure and column names are allocated and lead to leak - reported by Sergey Basov (cherry picked from commit 3e1b30e5d6020340eaf106b22b7b81ccc33de63d) --- Modified: src/modules/topos/tps_storage.c --- Diff: https://github.com/kamailio/kamailio/commit/fdb4538e02df824e946afb071aa708f… Patch: https://github.com/kamailio/kamailio/commit/fdb4538e02df824e946afb071aa708f… --- diff --git a/src/modules/topos/tps_storage.c b/src/modules/topos/tps_storage.c index 6817d5f..8145938 100644 --- a/src/modules/topos/tps_storage.c +++ b/src/modules/topos/tps_storage.c @@ -810,6 +810,7 @@ int tps_db_load_branch(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd) int nr_keys; int nr_cols; int n; + int ret = 0; if(msg==NULL || md==NULL || sd==NULL || _tps_db_handle==NULL) return -1; @@ -853,7 +854,8 @@ int tps_db_load_branch(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd) if (RES_ROW_N(db_res) <= 0) { LM_DBG("no stored record for <%.*s>\n", md->x_vbranch1.len, ZSW(md->x_vbranch1.s)); - return 1; + ret = 1; + goto done; } sd->cp = sd->cbuf; @@ -874,10 +876,11 @@ int tps_db_load_branch(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd) TPS_DATA_APPEND_DB(sd, db_res, n, &sd->s_method); n++; TPS_DATA_APPEND_DB(sd, db_res, n, &sd->s_cseq); n++; +done: if ((db_res!=NULL) && _tpsdbf.free_result(_tps_db_handle, db_res)<0) LM_ERR("failed to free result of query\n"); - return 0; + return ret; error: if ((db_res!=NULL) && _tpsdbf.free_result(_tps_db_handle, db_res)<0) @@ -907,6 +910,7 @@ int tps_db_load_dialog(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd) int nr_keys; int nr_cols; int n; + int ret = 0; if(msg==NULL || md==NULL || sd==NULL || _tps_db_handle==NULL) return -1; @@ -983,7 +987,8 @@ int tps_db_load_dialog(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd) if (RES_ROW_N(db_res) <= 0) { LM_DBG("no stored record for <%.*s>\n", md->a_uuid.len, ZSW(md->a_uuid.s)); - return 1; + ret = 1; + goto done; } sd->cp = sd->cbuf; @@ -1011,10 +1016,11 @@ int tps_db_load_dialog(sip_msg_t *msg, tps_data_t *md, tps_data_t *sd) TPS_DATA_APPEND_DB(sd, db_res, n, &sd->s_method); n++; TPS_DATA_APPEND_DB(sd, db_res, n, &sd->s_cseq); n++; +done: if ((db_res!=NULL) && _tpsdbf.free_result(_tps_db_handle, db_res)<0) LM_ERR("failed to free result of query\n"); - return 0; + return ret; error: if ((db_res!=NULL) && _tpsdbf.free_result(_tps_db_handle, db_res)<0)