diff options
| author | Jörg Mayer <jmayer@loplof.de> | 2013-06-19 03:23:31 +0000 |
|---|---|---|
| committer | Jörg Mayer <jmayer@loplof.de> | 2013-06-19 03:23:31 +0000 |
| commit | d9b5210c617428c712bbc254ee69a3067cd6ed40 (patch) | |
| tree | 1b0cd9311e8d9cc479af7cb8de73f2bfb2b1b420 /epan/dissectors | |
| parent | 2bb61fc8cef2ef668058eaa731efee637a09147e (diff) | |
Fix CID 712341: Dereference null return value (NULL_RETURNS)
Well, not really. Just catch that case and error out.
svn path=/trunk/; revision=50029
Diffstat (limited to 'epan/dissectors')
| -rw-r--r-- | epan/dissectors/packet-nbap.c | 7 | ||||
| -rw-r--r-- | epan/dissectors/packet-nbap.h | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/epan/dissectors/packet-nbap.c b/epan/dissectors/packet-nbap.c index baa8bf3e45..4516e8b67b 100644 --- a/epan/dissectors/packet-nbap.c +++ b/epan/dissectors/packet-nbap.c @@ -1,7 +1,7 @@ /* Do not modify this file. Changes will be overwritten. */ /* Generated automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-nbap.c */ -/* ../../tools/asn2wrs.py -p nbap -c ./nbap.cnf -s ./packet-nbap-template -D . -O ../../epan/dissectors NBAP-CommonDataTypes.asn NBAP-Constants.asn NBAP-Containers.asn NBAP-IEs.asn NBAP-PDU-Contents.asn NBAP-PDU-Descriptions.asn */ +/* /home/jmayer/work/wireshark/svn/trunk/tools/asn2wrs.py -p nbap -c /home/jmayer/work/wireshark/svn/trunk/asn1/nbap/nbap.cnf -s /home/jmayer/work/wireshark/svn/trunk/asn1/nbap/packet-nbap-template -D /home/jmayer/work/wireshark/svn/trunk/asn1/nbap -O /home/jmayer/work/wireshark/svn/trunk/epan/dissectors NBAP-CommonDataTypes.asn NBAP-Constants.asn NBAP-Containers.asn NBAP-IEs.asn NBAP-PDU-Contents.asn NBAP-PDU-Descriptions.asn */ /* Input file: packet-nbap-template.c */ @@ -10036,7 +10036,7 @@ dissect_nbap_AddorDeleteIndicator(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t static int dissect_nbap_CFN(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) { -#line 2138 "../../asn1/nbap/nbap.cnf" +#line 2139 "../../asn1/nbap/nbap.cnf" offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index, 0U, 255U, &cfn, FALSE); @@ -10312,6 +10312,7 @@ int i; nbap_hsdsch_channel_info[i].crnc_port, 0, NO_ADDR_B); if(conversation != NULL){ umts_fp_conversation_info = (umts_fp_conversation_info_t *)conversation_get_proto_data(conversation, proto_fp); + DISSECTOR_ASSERT(umts_fp_conversation_info != NULL); umts_fp_conversation_info->hrnti = hrnti; } } @@ -41063,7 +41064,7 @@ col_set_str(actx->pinfo->cinfo, COL_INFO,"RadioLinkReconfigurationCommit "); actx->pinfo->link_dir=P2P_DIR_DL; -#line 2130 "../../asn1/nbap/nbap.cnf" +#line 2131 "../../asn1/nbap/nbap.cnf" /* * Here we need to signal the CFN value, down to FP so * that lowert layers know when a reconfiguration becomes active diff --git a/epan/dissectors/packet-nbap.h b/epan/dissectors/packet-nbap.h index 1d727ef1e1..ecc3ece571 100644 --- a/epan/dissectors/packet-nbap.h +++ b/epan/dissectors/packet-nbap.h @@ -1,7 +1,7 @@ /* Do not modify this file. Changes will be overwritten. */ /* Generated automatically by the ASN.1 to Wireshark dissector compiler */ /* packet-nbap.h */ -/* ../../tools/asn2wrs.py -p nbap -c ./nbap.cnf -s ./packet-nbap-template -D . -O ../../epan/dissectors NBAP-CommonDataTypes.asn NBAP-Constants.asn NBAP-Containers.asn NBAP-IEs.asn NBAP-PDU-Contents.asn NBAP-PDU-Descriptions.asn */ +/* /home/jmayer/work/wireshark/svn/trunk/tools/asn2wrs.py -p nbap -c /home/jmayer/work/wireshark/svn/trunk/asn1/nbap/nbap.cnf -s /home/jmayer/work/wireshark/svn/trunk/asn1/nbap/packet-nbap-template -D /home/jmayer/work/wireshark/svn/trunk/asn1/nbap -O /home/jmayer/work/wireshark/svn/trunk/epan/dissectors NBAP-CommonDataTypes.asn NBAP-Constants.asn NBAP-Containers.asn NBAP-IEs.asn NBAP-PDU-Contents.asn NBAP-PDU-Descriptions.asn */ /* Input file: packet-nbap-template.h */ |