diff options
| author | Jeff Morriss <jeff.morriss@ulticom.com> | 2010-05-28 20:19:55 +0000 |
|---|---|---|
| committer | Jeff Morriss <jeff.morriss@ulticom.com> | 2010-05-28 20:19:55 +0000 |
| commit | 47e2d75820ee02066a61e341034aace6d28063c1 (patch) | |
| tree | d70498d786146b2e819ee680cc26ba8c90fd167e /epan/address_to_str.c | |
| parent | 17807a6b21c50a72e3bc11ddf0ff7bc2b313823a (diff) | |
| download | wireshark-47e2d75820ee02066a61e341034aace6d28063c1.tar.gz | |
Move some code (including the optional objects) into libwsutil
svn path=/trunk/; revision=33012
Diffstat (limited to 'epan/address_to_str.c')
| -rw-r--r-- | epan/address_to_str.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/epan/address_to_str.c b/epan/address_to_str.c index a09a4ae11c..1c39a57d66 100644 --- a/epan/address_to_str.c +++ b/epan/address_to_str.c @@ -50,7 +50,7 @@ #endif #ifdef NEED_INET_V6DEFS_H -# include "inet_v6defs.h" +# include "wsutil/inet_v6defs.h" #endif #include "to_str.h" @@ -395,7 +395,7 @@ address_to_str_buf(const address *addr, gchar *buf, int buf_len) /* copy to output buffer */ if (tempptr != temp) { size_t temp_len = (size_t) (tempptr - temp); - + if (temp_len < (size_t) buf_len) { memcpy(buf, temp, temp_len); buf[temp_len] = '\0'; |