osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

RRC: do not use a freed wmem_strbuf structure 

Bug: 16067
Change-Id: Id67445d1769ff60560ac52ba03736055892fd029
Reviewed-on: https://code.wireshark.org/review/34590
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
This commit is contained in:
Pascal Quantin 2019-09-22 12:08:12 +02:00
parent 5ba46c239c
commit 7d874e2d3c
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
epan/dissectors/asn1/rrc/rrc.cnf
View File

@ -901,7 +901,7 @@ HandoverFromUTRANCommand-GSM-r6-IEs/gsm-message/single-GSM-Message single-GSM-Me
/* Concat MCC and MNC in temp buffer */
temp_strbuf = wmem_strbuf_sized_new(actx->pinfo->pool,7,7);
wmem_strbuf_append_printf(temp_strbuf,"%%s",wmem_strbuf_get_str(last_mcc_strbuf));
wmem_strbuf_append_printf(temp_strbuf,"%%s",wmem_strbuf_get_str(mcc_mnc_strbuf));
wmem_strbuf_append_printf(temp_strbuf,"%%s",mcc_mnc_string);
/* Update length of recovered MCC-MNC pair */
string_len = (guint32)wmem_strbuf_get_len(temp_strbuf);
mcc_mnc_string = wmem_strbuf_finalize(temp_strbuf);

2
epan/dissectors/packet-rrc.c
View File

@ -135861,7 +135861,7 @@ dissect_rrc_PLMN_IdentityWithOptionalMCC_r6(tvbuff_t *tvb _U_, int offset _U_, a
/* Concat MCC and MNC in temp buffer */
temp_strbuf = wmem_strbuf_sized_new(actx->pinfo->pool,7,7);
wmem_strbuf_append_printf(temp_strbuf,"%s",wmem_strbuf_get_str(last_mcc_strbuf));
wmem_strbuf_append_printf(temp_strbuf,"%s",wmem_strbuf_get_str(mcc_mnc_strbuf));
wmem_strbuf_append_printf(temp_strbuf,"%s",mcc_mnc_string);
/* Update length of recovered MCC-MNC pair */
string_len = (guint32)wmem_strbuf_get_len(temp_strbuf);
mcc_mnc_string = wmem_strbuf_finalize(temp_strbuf);