diff options
| author | ingo@mysql.com <> | 2005-04-28 16:09:53 +0200 |
|---|---|---|
| committer | ingo@mysql.com <> | 2005-04-28 16:09:53 +0200 |
| commit | 286e204ac9d262dc7b1a357109307b915f8b1846 (patch) | |
| tree | 5a30fe5e5413105f8ba6b5ff0402945abd14b0c7 /myisam | |
| parent | 370cd22b577a382f7d5767c6fd16b41ef233e5e5 (diff) | |
| parent | 66a158a9dbe42d4786c16d5a0cd476de6f4ce825 (diff) | |
| download | mariadb-git-286e204ac9d262dc7b1a357109307b915f8b1846.tar.gz | |
Bug#8321 - myisampack bug in compression algorithm
Merge from 4.0.
Diffstat (limited to 'myisam')
| -rw-r--r-- | myisam/myisampack.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/myisam/myisampack.c b/myisam/myisampack.c index 263a468d96d..88f38be3c54 100644 --- a/myisam/myisampack.c +++ b/myisam/myisampack.c @@ -31,6 +31,7 @@ #define __GNU_LIBRARY__ /* Skip warnings in getopt.h */ #endif #include <my_getopt.h> +#include <assert.h> #if INT_MAX > 32767 #define BITS_SAVED 32 @@ -1991,7 +1992,9 @@ static void write_bits (register ulong value, register uint bits) { reg3 uint byte_buff; bits= (uint) -file_buffer.bits; - byte_buff=file_buffer.current_byte | (uint) (value >> bits); + DBUG_ASSERT(bits <= 8 * sizeof(value)); + byte_buff= (file_buffer.current_byte | + ((bits != 8 * sizeof(value)) ? (uint) (value >> bits) : 0)); #if BITS_SAVED == 32 *file_buffer.pos++= (byte) (byte_buff >> 24) ; *file_buffer.pos++= (byte) (byte_buff >> 16) ; @@ -1999,7 +2002,9 @@ static void write_bits (register ulong value, register uint bits) *file_buffer.pos++= (byte) (byte_buff >> 8) ; *file_buffer.pos++= (byte) byte_buff; - value&=(1 << bits)-1; + DBUG_ASSERT(bits <= 8 * sizeof(ulong)); + if (bits != 8 * sizeof(value)) + value&= (((ulong) 1) << bits) - 1; #if BITS_SAVED == 16 if (bits >= sizeof(uint)) { |