[sr-dev] git:master:882449e3: core: msg translator - unified error handling to simplify freeing allocated memory

Module: kamailio Branch: master Commit: 882449e3c0b1ac44cf810d079f696187af007451 URL: https://github.com/kamailio/kamailio/commit/882449e3c0b1ac44cf810d079f69618… Author: Daniel-Constantin Mierla <miconda(a)gmail.com> Committer: Daniel-Constantin Mierla <miconda(a)gmail.com> Date: 2017-07-17T15:54:13+02:00 core: msg translator - unified error handling to simplify freeing allocated memory --- Modified: src/core/msg_translator.c --- Diff: https://github.com/kamailio/kamailio/commit/882449e3c0b1ac44cf810d079f69618… Patch: https://github.com/kamailio/kamailio/commit/882449e3c0b1ac44cf810d079f69618… --- diff --git a/src/core/msg_translator.c b/src/core/msg_translator.c index 1a20d0d005..070c6d349d 100644 --- a/src/core/msg_translator.c +++ b/src/core/msg_translator.c @@ -1987,7 +1987,7 @@ char * build_req_buf_from_sip_req( struct sip_msg* msg, if ( received_test(msg) ) { if ((received_buf=received_builder(msg,&received_len))==0){ LM_ERR("received_builder failed\n"); - goto error01; /* free also line_buf */ + goto error00; /* free also line_buf */ } } @@ -2000,7 +2000,7 @@ char * build_req_buf_from_sip_req( struct sip_msg* msg, (msg->via1->rport /*&& msg->via1->rport->value.s==0*/)){ if ((rport_buf=rport_builder(msg, &rport_len))==0){ LM_ERR("rport_builder failed\n"); - goto error01; /* free everything */ + goto error00; /* free everything */ } } @@ -2031,10 +2031,10 @@ char * build_req_buf_from_sip_req( struct sip_msg* msg, via_insert_param=anchor_lump(msg, msg->via1->hdr.s-buf+size, 0, HDR_VIA_T); } - if (via_insert_param==0) goto error02; /* free received_buf */ + if (via_insert_param==0) goto error00; /* free received_buf */ if (insert_new_lump_after(via_insert_param, received_buf, received_len, HDR_VIA_T) ==0 ) { - goto error02; /* free received_buf */ + goto error00; /* free received_buf */ } received_buf = NULL; } @@ -2049,10 +2049,10 @@ char * build_req_buf_from_sip_req( struct sip_msg* msg, via_insert_param=anchor_lump(msg, msg->via1->hdr.s-buf+size, 0, HDR_VIA_T); } - if (via_insert_param==0) goto error03; /* free rport_buf */ + if (via_insert_param==0) goto error00; /* free rport_buf */ if (insert_new_lump_after(via_insert_param, rport_buf, rport_len, HDR_VIA_T) ==0 ) { - goto error03; /* free rport_buf */ + goto error00; /* free rport_buf */ } rport_buf = NULL; } @@ -2091,10 +2091,10 @@ char * build_req_buf_from_sip_req( struct sip_msg* msg, HDR_ROUTE_T); } if (unlikely(path_anchor==0)) - goto error05; + goto error00; if (unlikely((path_lump=insert_new_lump_after(path_anchor, path_buf.s, path_buf.len, HDR_ROUTE_T))==0)) { - goto error05; + goto error00; } path_buf.s = NULL; } @@ -2150,7 +2150,7 @@ char * build_req_buf_from_sip_req( struct sip_msg* msg, if(likely(line_buf)) { if ((via_lump=insert_new_lump_before(via_anchor, line_buf, via_len, HDR_VIA_T))==0) { - goto error04; + goto error00; } line_buf = 0; } @@ -2204,17 +2204,12 @@ char * build_req_buf_from_sip_req( struct sip_msg* msg, *returned_len=new_len; return new_buf; -error01: -error02: -error03: -error04: -error05: +error00: if (received_buf) pkg_free(received_buf); if (rport_buf) pkg_free(rport_buf); if (path_buf.s) pkg_free(path_buf.s); if (line_buf) pkg_free(line_buf); -error00: *returned_len=0; return 0; }