diff options
| author | Jeff Morriss <jeff.morriss@ulticom.com> | 2007-08-15 22:27:52 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss@ulticom.com> | 2007-08-15 22:27:52 +0000 |
| commit | 3dec62b85cf62734219cc0278c41582d5aa5bc2b (patch) | |
| tree | 281bd56379c0017cc168bdd0ffe45a0d88efc5e4 /epan/dissectors/packet-http.c | |
| parent | 0cab42b4659e2f1e35d22da6b5a849913b357f1b (diff) | |
- s/ntohs/g_ntohs
- s/ntohl/g_ntohl
- s/free/g_free
- Change some tvb_get_string()+g_free()'s into tvb_get_ephemeral_string()
- Change some tvb_fake_unicode()+g_free()'s into tvb_get_ephemeral_faked_unicode()
- Change some tvb_get_string() calls that were clearly memory leaks (like
atoi(tvb_get_string(...))) into tvb_get_ephemeral_string()
svn path=/trunk/; revision=22515
Diffstat (limited to 'epan/dissectors/packet-http.c')
| -rw-r--r-- | epan/dissectors/packet-http.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/dissectors/packet-http.c b/epan/dissectors/packet-http.c index 254c15f473..1f8decc2d4 100644 --- a/epan/dissectors/packet-http.c +++ b/epan/dissectors/packet-http.c @@ -1233,7 +1233,7 @@ basic_request_dissector(tvbuff_t *tvb, proto_tree *tree, int offset, return; /* Save the request URI for various later uses */ - request_uri = (gchar *)tvb_get_string(tvb, offset, tokenlen); + request_uri = (gchar *)tvb_get_ephemeral_string(tvb, offset, tokenlen); stat_info->request_uri = ep_strdup(request_uri); conv_data->request_uri = se_strdup(request_uri); @@ -1502,7 +1502,7 @@ http_payload_subdissector(tvbuff_t *next_tvb, proto_tree *tree, next_tvb, 0, 0, strings[0]); PROTO_ITEM_SET_GENERATED(item); - item = proto_tree_add_uint(sub_tree, hf_http_proxy_connect_port, + item = proto_tree_add_uint(sub_tree, hf_http_proxy_connect_port, next_tvb, 0, 0, strtol(strings[1], NULL, 10) ); PROTO_ITEM_SET_GENERATED(item); |