diff options
| author | wmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-01-17 17:33:50 +0000 |
|---|---|---|
| committer | wmeier <wmeier@f5534014-38df-0310-8fa8-9805f1628bb7> | 2009-01-17 17:33:50 +0000 |
| commit | ea86d6402fb15d8eea9828c7aecb5d058f4c4413 (patch) | |
| tree | e3ec31d2cf4a5e91987840cf3236a772886a38a2 /epan/dissectors/packet-msrp.c | |
| parent | 6b7787e2cd5168bcb4e3ca12ce593db5a33f89ec (diff) | |
Use ascii_strdown_inplace instead of g_ascii_strdown in a few places.
This also fixes a few cases where memory was not freed after
g_ascii_strdown.
git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@27254 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/dissectors/packet-msrp.c')
| -rw-r--r-- | epan/dissectors/packet-msrp.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/epan/dissectors/packet-msrp.c b/epan/dissectors/packet-msrp.c index 799cb40c58..b83a6cec90 100644 --- a/epan/dissectors/packet-msrp.c +++ b/epan/dissectors/packet-msrp.c @@ -36,6 +36,9 @@ #include <ctype.h> #include <glib.h> + +#include <wsutil/str_util.h> + #include <epan/conversation.h> #include <epan/strutil.h> #include <epan/packet.h> @@ -485,8 +488,7 @@ dissect_msrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) gboolean have_body = FALSE; gboolean found_match = FALSE; gint content_type_len, content_type_parameter_str_len; - char *media_type_str = NULL; - char *media_type_str_lower_case = NULL; + gchar *media_type_str_lower_case = NULL; char *content_type_parameter_str = NULL; tvbuff_t *next_tvb; gint parameter_offset; @@ -686,8 +688,8 @@ dissect_msrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) content_type_parameter_str = tvb_get_ephemeral_string(tvb, parameter_offset, content_type_parameter_str_len); } - media_type_str = tvb_get_ephemeral_string(tvb, value_offset, content_type_len); - media_type_str_lower_case = g_ascii_strdown(media_type_str, -1); + media_type_str_lower_case = ascii_strdown_inplace( + (gchar *)tvb_get_ephemeral_string(tvb, value_offset, content_type_len)); break; default: @@ -720,7 +722,6 @@ dissect_msrp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) media_type_str_lower_case, next_tvb, pinfo, msrp_data_tree); - g_free(media_type_str_lower_case); pinfo->private_data = save_private_data; /* If no match dump as text */ } |