diff options
| author | Gerald Combs <gerald@wireshark.org> | 2004-07-29 02:25:54 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2004-07-29 02:25:54 +0000 |
| commit | e1ede171f9fbcca3709a2ac573b3f7958766468f (patch) | |
| tree | 4d290c6c1cab41121b8eef9c9229a3fa547f9b38 /epan/dissectors/packet-rtp.c | |
| parent | 8f9a933ef05e9fd754191a704d39ac849df151be (diff) | |
Fix a null pointer dereference.
svn path=/trunk/; revision=11561
Diffstat (limited to 'epan/dissectors/packet-rtp.c')
| -rw-r--r-- | epan/dissectors/packet-rtp.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/epan/dissectors/packet-rtp.c b/epan/dissectors/packet-rtp.c index 900b01c2be..7494a96e1b 100644 --- a/epan/dissectors/packet-rtp.c +++ b/epan/dissectors/packet-rtp.c @@ -655,11 +655,13 @@ void show_setup_info(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) struct _rtp_conversation_info *p_conv_packet_data; p_conv_data = conversation_get_proto_data(p_conv, proto_rtp); - /* Save this conversation info into packet info */ - p_conv_packet_data = g_mem_chunk_alloc(rtp_conversations); - strcpy(p_conv_packet_data->method, p_conv_data->method); - p_conv_packet_data->frame_number = p_conv_data->frame_number; - p_add_proto_data(pinfo->fd, proto_rtp, p_conv_packet_data); + if (p_conv_data) { + /* Save this conversation info into packet info */ + p_conv_packet_data = g_mem_chunk_alloc(rtp_conversations); + strcpy(p_conv_packet_data->method, p_conv_data->method); + p_conv_packet_data->frame_number = p_conv_data->frame_number; + p_add_proto_data(pinfo->fd, proto_rtp, p_conv_packet_data); + } } } |