aboutsummaryrefslogtreecommitdiffstats
path: root/epan/tvbuff.c
diff options
context:
space:
mode:
authorashokn <ashokn@f5534014-38df-0310-8fa8-9805f1628bb7>2008-03-25 18:53:17 +0000
committerashokn <ashokn@f5534014-38df-0310-8fa8-9805f1628bb7>2008-03-25 18:53:17 +0000
commita021c2478e8ca62a9e9f388adab6e47120560892 (patch)
treeb54bb7e3187daf2ad0ba76e0794c756f3a47e07d /epan/tvbuff.c
parent6a7cc10adf27144f148ec3856ff7d0464135f79d (diff)
Fixed bug with tvb_get_bits64(); the mask array had one less "ff" than
it needs. This manifests itself in calls to tvb_get_bits64() and in calls to proto_tree_add_bits_xxx() for >32 bits. git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@24726 f5534014-38df-0310-8fa8-9805f1628bb7
Diffstat (limited to 'epan/tvbuff.c')
-rw-r--r--epan/tvbuff.c17
1 files changed, 8 insertions, 9 deletions
diff --git a/epan/tvbuff.c b/epan/tvbuff.c
index bfd3954a05..eda82a28e7 100644
--- a/epan/tvbuff.c
+++ b/epan/tvbuff.c
@@ -1584,17 +1584,16 @@ tvb_get_bits16(tvbuff_t *tvb, gint bit_offset, gint no_of_bits,gboolean little_e
}
-/* Get 9 - 16 bits */
/* Bit offset mask for number of bits = 32 - 64 */
static const guint64 bit_mask64[] = {
- G_GINT64_CONSTANT(0xffffffffffffffU),
- G_GINT64_CONSTANT(0x7fffffffffffffU),
- G_GINT64_CONSTANT(0x3fffffffffffffU),
- G_GINT64_CONSTANT(0x1fffffffffffffU),
- G_GINT64_CONSTANT(0x0fffffffffffffU),
- G_GINT64_CONSTANT(0x07ffffffffffffU),
- G_GINT64_CONSTANT(0x03ffffffffffffU),
- G_GINT64_CONSTANT(0x01ffffffffffffU)
+ G_GINT64_CONSTANT(0xffffffffffffffffU),
+ G_GINT64_CONSTANT(0x7fffffffffffffffU),
+ G_GINT64_CONSTANT(0x3fffffffffffffffU),
+ G_GINT64_CONSTANT(0x1fffffffffffffffU),
+ G_GINT64_CONSTANT(0x0fffffffffffffffU),
+ G_GINT64_CONSTANT(0x07ffffffffffffffU),
+ G_GINT64_CONSTANT(0x03ffffffffffffffU),
+ G_GINT64_CONSTANT(0x01ffffffffffffffU)
};
guint32