aboutsummaryrefslogtreecommitdiffstats
path: root/epan
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2005-04-05 14:40:59 +0000
committerGerald Combs <gerald@wireshark.org>2005-04-05 14:40:59 +0000
commitc92c1df4a4eb41b9ddbfa2b2a11c3e59764518dd (patch)
tree6c0a87d3c3ec0b7a12b8afc89a80ec4ee325c513 /epan
parent573ba4ee40fc61a913ef26cf0830b5e36605ded1 (diff)
Try not to call proto_tree_add_text() with negative lengths in error messages.
svn path=/trunk/; revision=14018
Diffstat (limited to 'epan')
-rw-r--r--epan/dissectors/packet-wsp.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-wsp.c b/epan/dissectors/packet-wsp.c
index f8d8db1a45..ce0434c327 100644
--- a/epan/dissectors/packet-wsp.c
+++ b/epan/dissectors/packet-wsp.c
@@ -3914,7 +3914,7 @@ wkh_content_type_header(openwave_x_up_proxy_push_accept,
offset += val_len; \
} else { \
DebugLog(("\tError: invalid parameter value!\n")); \
- proto_tree_add_string(tree, hf, tvb, start, len - start, \
+ proto_tree_add_string(tree, hf, tvb, start, len, \
InvalidParameterValue(Uppercase, value)); \
offset = start + len; /* Skip to end of buffer */ \
} \
@@ -3950,7 +3950,7 @@ wkh_content_type_header(openwave_x_up_proxy_push_accept,
g_free(val_str); \
offset += val_len; \
} else { \
- proto_tree_add_string(tree, hf, tvb, start, len - start, \
+ proto_tree_add_string(tree, hf, tvb, start, len, \
InvalidParameterValue(Uppercase, value)); \
offset = start + len; /* Skip to end of buffer */ \
}
@@ -4135,7 +4135,7 @@ parameter (proto_tree *tree, proto_item *ti, tvbuff_t *tvb, int start, int len)
proto_item_append_string(ti, str);
g_free(str);
} else { /* Invalid parameter value */
- proto_tree_add_text (tree, tvb, start, len - start,
+ proto_tree_add_text (tree, tvb, start, len,
InvalidParameterValue("Type",
"Constrained-encoding"));
offset = start + len; /* Skip the parameters */
@@ -4199,7 +4199,7 @@ parameter (proto_tree *tree, proto_item *ti, tvbuff_t *tvb, int start, int len)
g_free(s);
offset++;
} else { /* Error */
- proto_tree_add_text (tree, tvb, start, len - start,
+ proto_tree_add_text (tree, tvb, start, len,
InvalidParameterValue("SEC", "Short-integer"));
offset = start + len; /* Skip to end of buffer */
}
@@ -4220,7 +4220,7 @@ parameter (proto_tree *tree, proto_item *ti, tvbuff_t *tvb, int start, int len)
g_free(s);
offset += val_len;
} else {
- proto_tree_add_text (tree, tvb, start, len - start,
+ proto_tree_add_text (tree, tvb, start, len,
InvalidParameterValue("Level", "Version-value"));
offset = start + len; /* Skip to end of buffer */
}