diff options
| author | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2005-08-10 14:35:24 +0000 |
|---|---|---|
| committer | Ronnie Sahlberg <ronnie_sahlberg@ozemail.com.au> | 2005-08-10 14:35:24 +0000 |
| commit | 74fff802f958603c7cf05a764079d546d15ecd4d (patch) | |
| tree | 7c7f4e5bcc83c5656b2e55c10006b3dee287bd2d /epan/dissectors/packet-image-jfif.c | |
| parent | 39ab2568aab431f914ef55a6aee58329a21583de (diff) | |
tvb_get_stringz() to tvb_get_ephemeral_stringz() conversion.
svn path=/trunk/; revision=15275
Diffstat (limited to 'epan/dissectors/packet-image-jfif.c')
| -rw-r--r-- | epan/dissectors/packet-image-jfif.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/epan/dissectors/packet-image-jfif.c b/epan/dissectors/packet-image-jfif.c index 2040e79401..b169a177fd 100644 --- a/epan/dissectors/packet-image-jfif.c +++ b/epan/dissectors/packet-image-jfif.c @@ -510,10 +510,9 @@ process_app0_segment(proto_tree *tree, tvbuff_t *tvb, guint32 len, proto_tree_add_item(subtree, hf_len, tvb, 2, 2, FALSE); - str = tvb_get_stringz(tvb, 4, &str_size); + str = tvb_get_ephemeral_stringz(tvb, 4, &str_size); ti = proto_tree_add_item(subtree, hf_identifier, tvb, 4, str_size, FALSE); if (strcmp(str, "JFIF") == 0) { - g_free(str); /* Version */ ti = proto_tree_add_none_format(subtree, hf_version, tvb, 9, 2, "Version: %u.%u", @@ -551,7 +550,6 @@ process_app0_segment(proto_tree *tree, tvbuff_t *tvb, guint32 len, } } } else if (strcmp(str, "JFXX") == 0) { - g_free(str); proto_tree_add_item(subtree, hf_extension_code, tvb, 9, 1, FALSE); { @@ -568,7 +566,6 @@ process_app0_segment(proto_tree *tree, tvbuff_t *tvb, guint32 len, } } } else { /* Unknown */ - g_free(str); proto_item_append_text(ti, " (unknown identifier)"); offset = 4 + str_size; @@ -607,7 +604,7 @@ process_app1_segment(proto_tree *tree, tvbuff_t *tvb, guint32 len, proto_tree_add_item(subtree, hf_len, tvb, offset, 2, FALSE); offset += 2; - str = tvb_get_stringz(tvb, offset, &str_size); + str = tvb_get_ephemeral_stringz(tvb, offset, &str_size); ti = proto_tree_add_item(subtree, hf_identifier, tvb, offset, str_size, FALSE); offset += str_size; if (strcmp(str, "Exif") == 0) { @@ -619,8 +616,6 @@ process_app1_segment(proto_tree *tree, tvbuff_t *tvb, guint32 len, guint32 val_32; guint16 num_fields; - g_free(str); - offset++; /* Skip a byte supposed to be 0x00 */ tiff_start = offset; @@ -734,7 +729,6 @@ process_app1_segment(proto_tree *tree, tvbuff_t *tvb, guint32 len, break; } } else { - g_free(str); proto_tree_add_text(subtree, tvb, offset, -1, "Remaining segment data (%u bytes)", len - 2 - str_size); proto_item_append_text(ti, " (Unknown identifier)"); @@ -766,13 +760,11 @@ process_app2_segment(proto_tree *tree, tvbuff_t *tvb, guint32 len, proto_tree_add_item(subtree, hf_len, tvb, 2, 2, FALSE); - str = tvb_get_stringz(tvb, 4, &str_size); + str = tvb_get_ephemeral_stringz(tvb, 4, &str_size); ti = proto_tree_add_item(subtree, hf_identifier, tvb, 4, str_size, FALSE); if (strcmp(str, "FPXR") == 0) { - g_free(str); proto_tree_add_text(tree, tvb, 0, -1, "Exif FlashPix APP2 application marker"); } else { - g_free(str); proto_tree_add_text(subtree, tvb, 4 + str_size, -1, "Remaining segment data (%u bytes)", len - 2 - str_size); proto_item_append_text(ti, " (Unknown identifier)"); |