aboutsummaryrefslogtreecommitdiffstats
path: root/epan/to_str.h
diff options
context:
space:
mode:
authorGerald Combs <gerald@wireshark.org>2007-01-29 20:25:26 +0000
committerGerald Combs <gerald@wireshark.org>2007-01-29 20:25:26 +0000
commit063621f11ba5c3c05514be94bd03865096b911b5 (patch)
tree97af587679fd749ac55b6ce95491d0c2260b5f7d /epan/to_str.h
parent54f4d487f4e9425492298cf08099cf8fa4adcf9a (diff)
Fix potential buffer overruns in address_to_str_buf() found by Andrej
Mikus. Add a buf_len parameter to ip_to_str_buf(), and make sure it's enforced. Copy the release notes over from the 0.99.5 trunk and add a note about the ISUP dissector (which is affected by the overrun). svn path=/trunk/; revision=20607
Diffstat (limited to 'epan/to_str.h')
-rw-r--r--epan/to_str.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/epan/to_str.h b/epan/to_str.h
index eed1522333..22ea4bc5c1 100644
--- a/epan/to_str.h
+++ b/epan/to_str.h
@@ -32,6 +32,8 @@
#define MAX_OID_STR_LEN 256
#define GUID_STR_LEN 37
+#define MAX_IP_STR_LEN 16
+#define MAX_ADDR_STR_LEN 256
/*
* Resolution of a time stamp.
@@ -57,7 +59,7 @@ extern void address_to_str_buf(const address *addr, gchar *buf, int buf_len)
extern gchar* bytestring_to_str(const guint8 *, guint32, char);
extern gchar* ether_to_str(const guint8 *);
extern gchar* ip_to_str(const guint8 *);
-extern void ip_to_str_buf(const guint8 *, gchar *);
+extern void ip_to_str_buf(const guint8 *ad, gchar *buf, int buf_len);
extern gchar* fc_to_str(const guint8 *);
extern gchar* fcwwn_to_str (const guint8 *);
extern gchar* ip6_to_str(const struct e_in6_addr *);