osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Remove some proto_item_append_string 

These calls to proto_item_append_string were not taking into account all
of the special treatment needed to use it, so proto_item_append_text
(or similar) was probably intended.

Change-Id: I5d1f092f8162a87d30fc8dc694f6124dc81372b5
Reviewed-on: https://code.wireshark.org/review/15575
Petri-Dish: Michael Mann <mmann78@netscape.net>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Jeff Morriss <jeff.morriss.ws@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
This commit is contained in:
Michael Mann 2016-05-26 09:25:38 -04:00
parent 7ca8e46ffb
commit 9f02b25caf
3 changed files with 38 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
epan/dissectors/packet-ar_drone.c
View File

@ -207,7 +207,7 @@ dissect_ar_drone(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data
{
PCMD_str = " (ROLL RIGHT)";
}
proto_item_append_string(ti, PCMD_str);
proto_item_append_text(ti, "%s", PCMD_str);
offset += (length + 1);
/* Add PCMD Pitch */
@ -239,7 +239,7 @@ dissect_ar_drone(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data
{
PCMD_str = " (PITCH BACKWARD)";
}
proto_item_append_string(ti, PCMD_str);
proto_item_append_text(ti, "%s", PCMD_str);
offset += (length + 1);
/* Add PCMD Gaz */
@ -271,7 +271,7 @@ dissect_ar_drone(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data
{
PCMD_str = " (INCREASE VERT SPEED)";
}
proto_item_append_string(ti, PCMD_str);
proto_item_append_text(ti, "%s", PCMD_str);
offset += (length + 1);
/* Add PCMD Yaw */
@ -303,7 +303,7 @@ dissect_ar_drone(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data
{
PCMD_str = " (ROTATE RIGHT)";
}
proto_item_append_string(ti, PCMD_str);
proto_item_append_text(ti, "%s", PCMD_str);
offset += (length + 1);
}
else if (!strncmp(command, "AT*REF", 6))

6
epan/dissectors/packet-olsr.c
View File

@ -327,7 +327,7 @@ static int dissect_olsr_hello(tvbuff_t *tvb, packet_info *pinfo, proto_tree *ols
offset += 2;
if (message_size < 4) {
proto_item_append_string(ti, "(too short, must be >= 4)");
expert_add_info_format(pinfo, ti, &ei_olsr_not_enough_bytes, "(too short, must be >= 4)");
return message_end;
}
offset = handleNeighbors(tvb, pinfo, link_type_tree, offset, offset + message_size - 4);
@ -600,13 +600,13 @@ static int dissect_olsr(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, voi
offset += 2;
if (message_len < 8 + pinfo->src.len) {
proto_item_append_text(ti, "(too short, must be >= %d)", 8 + pinfo->src.len);
expert_add_info_format(pinfo, ti, &ei_olsr_not_enough_bytes, "(too short, must be >= %d)", 8 + pinfo->src.len);
break;
}
message_end = offset + message_len - 4;
if (message_end > packet_len) {
proto_item_append_string(ti, "(not enough data for message)");
expert_add_info_format(pinfo, ti, &ei_olsr_not_enough_bytes, "(not enough data for message)");
break;
}

57
epan/dissectors/packet-wsp.c
View File

@ -1773,27 +1773,30 @@ wkh_push_flag(proto_tree *tree, tvbuff_t *tvb, guint32 hdr_start, packet_info *p
wkh_0a_Declarations;
proto_item *ti = NULL;
proto_tree *subtree = NULL;
wmem_strbuf_t *push_flag_str = wmem_strbuf_new(wmem_packet_scope(), "");
wkh_1_WellKnownValue(hf_hdr_name_value, ett_push_flag, "Push Flag");
ti = proto_tree_add_string(tree, hf_hdr_push_flag,
tvb, hdr_start, offset - hdr_start, "");
subtree = proto_item_add_subtree(ti, ett_header);
proto_tree_add_uint(subtree, hf_hdr_push_flag_auth,
tvb, val_start, 1, val_id);
proto_tree_add_uint(subtree, hf_hdr_push_flag_trust,
tvb, val_start, 1, val_id);
proto_tree_add_uint(subtree, hf_hdr_push_flag_last,
tvb, val_start, 1, val_id);
if (val_id & 0x01)
proto_item_append_string(ti, " (Initiator URI authenticated)");
if (val_id & 0x02)
proto_item_append_string(ti, " (Content trusted)");
if (val_id & 0x04)
proto_item_append_string(ti, " (Last push message)");
if (val_id & 0x78)
proto_item_append_text(ti, " <Warning: Reserved flags set>");
else
ok = TRUE;
if (val_id & 0x01)
wmem_strbuf_append(push_flag_str, " (Initiator URI authenticated)");
if (val_id & 0x02)
wmem_strbuf_append(push_flag_str, " (Content trusted)");
if (val_id & 0x04)
wmem_strbuf_append(push_flag_str, " (Last push message)");
if (val_id & 0x78)
wmem_strbuf_append(push_flag_str, " <Warning: Reserved flags set>");
else
ok = TRUE;
ti = proto_tree_add_string(tree, hf_hdr_push_flag,
tvb, hdr_start, offset - hdr_start, wmem_strbuf_get_str(push_flag_str));
subtree = proto_item_add_subtree(ti, ett_header);
proto_tree_add_uint(subtree, hf_hdr_push_flag_auth,
tvb, val_start, 1, val_id);
proto_tree_add_uint(subtree, hf_hdr_push_flag_trust,
tvb, val_start, 1, val_id);
proto_tree_add_uint(subtree, hf_hdr_push_flag_last,
tvb, val_start, 1, val_id);
wkh_2_TextualValueInv;
/* Invalid */
wkh_3_ValueWithLength;
@ -2841,6 +2844,7 @@ wkh_cache_control(proto_tree *tree, tvbuff_t *tvb, guint32 hdr_start, packet_inf
guint32 off, len, val = 0;
guint8 peek, cache_control_directive;
proto_item *ti = NULL;
wmem_strbuf_t *cache_str;
wkh_1_WellKnownValue(hf_hdr_name_value, ett_cache_control, "Cache-control");
val = val_id & 0x7F;
@ -2868,27 +2872,28 @@ wkh_cache_control(proto_tree *tree, tvbuff_t *tvb, guint32 hdr_start, packet_inf
switch (cache_control_directive & 0x7F) {
case CACHE_CONTROL_NO_CACHE:
case CACHE_CONTROL_PRIVATE:
ti = proto_tree_add_string(tree, hf_hdr_cache_control,
tvb, hdr_start, offset - hdr_start,
val_to_str_ext (cache_control_directive & 0x7F, &vals_cache_control_ext,
cache_str = wmem_strbuf_new(wmem_packet_scope(), val_to_str_ext (cache_control_directive & 0x7F, &vals_cache_control_ext,
"<Unknown cache control directive 0x%02X>"));
/* TODO: split multiple entries */
ok = TRUE;
while (ok && (off < offset)) { /* 1*( Field-name ) */
peek = tvb_get_guint8(tvb, off);
if (peek & 0x80) { /* Well-known-field-name */
proto_item_append_string(ti,
wmem_strbuf_append(cache_str,
val_to_str (peek, vals_field_names,
"<Unknown WSP header field 0x%02X>"));
off++;
} else { /* Token-text */
get_token_text(val_str, tvb, off, len, ok);
if (ok) {
proto_item_append_string(ti, val_str);
wmem_strbuf_append(cache_str, val_str);
off += len;
}
}
}
proto_tree_add_string(tree, hf_hdr_cache_control,
tvb, hdr_start, offset - hdr_start,
wmem_strbuf_get_str(cache_str));
break;
case CACHE_CONTROL_MAX_AGE:
@ -2929,7 +2934,7 @@ wkh_cache_control(proto_tree *tree, tvbuff_t *tvb, guint32 hdr_start, packet_inf
}
} else { /* Token-text | 0x00 */
/* TODO - check that we have Token-text or 0x00 */
proto_item_append_string(ti, val_str);
proto_item_append_text(ti, "%s", val_str);
}
}
}
@ -3130,7 +3135,7 @@ wkh_content_range(proto_tree *tree, tvbuff_t *tvb, guint32 hdr_start, packet_inf
/* Now check next value */
val = tvb_get_guint8(tvb, off);
if (val == 0x80) { /* Unknown length */
proto_item_append_string(ti, "; entity-length=unknown");
proto_item_append_text(ti, "%s", "; entity-length=unknown");
} else { /* Uintvar entity length */
get_uintvar_integer (val, tvb, off, len, ok);
if (ok) {