diff options
| author | wmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-03-22 16:25:01 +0000 |
|---|---|---|
| committer | wmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-03-22 16:25:01 +0000 |
| commit | f759d6006d339748281713d138d30f629e857a9a (patch) | |
| tree | c8532191e8d48c418fe75c3df282b2902a6c6ff3 /epan/dissectors/packet-rtp.c | |
| parent | 065e509e0957bd317aeb4d2593583339bd5c1064 (diff) | |
(Minor) Change a g_snprint to a g_strlcpy;
Also: Fix an off-by-1 inadvertantly introduced a while back.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@27820 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-rtp.c')
| -rw-r--r-- | epan/dissectors/packet-rtp.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/epan/dissectors/packet-rtp.c b/epan/dissectors/packet-rtp.c index 1f04862dc7..90f039f0fb 100644 --- a/epan/dissectors/packet-rtp.c +++ b/epan/dissectors/packet-rtp.c @@ -444,7 +444,7 @@ void srtp_add_address(packet_info *pinfo, /* Free the hash if already exists */ rtp_free_hash_dyn_payload(p_conv_data->rtp_dyn_payload); - g_strlcpy(p_conv_data->method, setup_method, MAX_RTP_SETUP_METHOD_SIZE); + g_strlcpy(p_conv_data->method, setup_method, MAX_RTP_SETUP_METHOD_SIZE+1); p_conv_data->frame_number = setup_frame_number; p_conv_data->rtp_dyn_payload = rtp_dyn_payload; p_conv_data->srtp_info = srtp_info; @@ -1339,8 +1339,7 @@ static void get_conv_info(packet_info *pinfo, struct _rtp_info *rtp_info) /* Save this conversation info into packet info */ p_conv_packet_data = se_alloc(sizeof(struct _rtp_conversation_info)); - g_snprintf(p_conv_packet_data->method, MAX_RTP_SETUP_METHOD_SIZE+1, "%s", p_conv_data->method); - p_conv_packet_data->method[MAX_RTP_SETUP_METHOD_SIZE]='\0'; + g_strlcpy(p_conv_packet_data->method, p_conv_data->method, MAX_RTP_SETUP_METHOD_SIZE+1); p_conv_packet_data->frame_number = p_conv_data->frame_number; p_conv_packet_data->rtp_dyn_payload = p_conv_data->rtp_dyn_payload; p_conv_packet_data->rtp_conv_info = p_conv_data->rtp_conv_info; |