diff options
| author | Chris Maynard <Christopher.Maynard@GTECH.COM> | 2012-10-18 17:29:37 +0000 |
|---|---|---|
| committer | Chris Maynard <Christopher.Maynard@GTECH.COM> | 2012-10-18 17:29:37 +0000 |
| commit | b66cc7ed482e74144802d00710ef8877b87406e8 (patch) | |
| tree | 2c17b07aa145e438e0f5290c4f05dd795e352ee1 /wsutil/str_util.h | |
| parent | b29f57e4e0409a5495ac221a452857ca2920db1b (diff) | |
| download | wireshark-b66cc7ed482e74144802d00710ef8877b87406e8.tar.gz | |
str_util.c:format_size() uses 0xff00 for the mask, so left-shift format_size_prefix_[si|iec] by 8, not 16. Fixes Coverity CID 733852: Operands don't affect result.
svn path=/trunk/; revision=45637
Diffstat (limited to 'wsutil/str_util.h')
| -rw-r--r-- | wsutil/str_util.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/wsutil/str_util.h b/wsutil/str_util.h index dacc34d4d7..c43e2e05de 100644 --- a/wsutil/str_util.h +++ b/wsutil/str_util.h @@ -79,8 +79,8 @@ typedef enum { /* XXX Do we use bytes/s anywhere? */ format_size_unit_bits = 2, /**< "bits" for un-prefixed sizes, "b" otherwise. */ format_size_unit_bits_s = 3, /**< "bits/s" for un-prefixed sizes, "bps" otherwise. */ - format_size_prefix_si = 0 << 16, /**< SI (power of 1000) prefixes will be used. */ - format_size_prefix_iec = 1 << 16 /**< IEC (power of 1024) prefixes will be used. */ + format_size_prefix_si = 0 << 8, /**< SI (power of 1000) prefixes will be used. */ + format_size_prefix_iec = 1 << 8 /**< IEC (power of 1024) prefixes will be used. */ /* XXX format_size_prefix_default_for_this_particular_os ? */ } format_size_flags_e; |