diff options
| author | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2014-01-07 22:17:32 +0000 |
|---|---|---|
| committer | Jakub Zawadzki <darkjames-ws@darkjames.pl> | 2014-01-07 22:17:32 +0000 |
| commit | abda30e9e6d8fd9aa28edc4677796e61a9c88997 (patch) | |
| tree | ab90b4994f29142a1554c36b6160033b3d499405 /wsutil/unicode-utils.h | |
| parent | d1dcee936b2a0ed257c526889b664e2b314d3eb0 (diff) | |
| download | wireshark-abda30e9e6d8fd9aa28edc4677796e61a9c88997.tar.gz | |
Fix bug #9618: Invalid utf8 causes JSON dissector assertion failure "g_utf8_validate"
Validate JSON UTF-8 characters, replace with '?' when invalid.
svn path=/trunk/; revision=54633
Diffstat (limited to 'wsutil/unicode-utils.h')
| -rw-r--r-- | wsutil/unicode-utils.h | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/wsutil/unicode-utils.h b/wsutil/unicode-utils.h index a9d5318f6b..7b29d8460a 100644 --- a/wsutil/unicode-utils.h +++ b/wsutil/unicode-utils.h @@ -25,21 +25,25 @@ #ifndef __UNICODEUTIL_H__ #define __UNICODEUTIL_H__ -#include "ws_symbol_export.h" - -#ifdef _WIN32 - #include "config.h" +#include "ws_symbol_export.h" + #include <glib.h> -#include <windows.h> -#include <tchar.h> -#include <wchar.h> /** * @file Unicode convenience routines. */ +WS_DLL_PUBLIC +int ws_utf8_char_len(guint8 ch); + +#ifdef _WIN32 + +#include <windows.h> +#include <tchar.h> +#include <wchar.h> + /** Given a UTF-8 string, convert it to UTF-16. This is meant to be used * to convert between GTK+ 2.x (UTF-8) to Windows (UTF-16). * |