database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Bug#8321 - myisampack bug in compression algorithm

Browse Source 
Merge from 4.0.
This commit is contained in:
ingo@mysql.com
2005-04-28 16:09:53 +02:00
parent 370cd22b57 66a158a9db
commit 286e204ac9
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
myisam/myisampack.c
View File

@ -31,6 +31,7 @@
#define __GNU_LIBRARY__ /* Skip warnings in getopt.h */ #define __GNU_LIBRARY__ /* Skip warnings in getopt.h */
#endif #endif
#include <my_getopt.h> #include <my_getopt.h>
#include <assert.h>
#if INT_MAX > 32767 #if INT_MAX > 32767
#define BITS_SAVED 32 #define BITS_SAVED 32
@ -1991,7 +1992,9 @@ static void write_bits (register ulong value, register uint bits)
{ {
reg3 uint byte_buff; reg3 uint byte_buff;
bits= (uint) -file_buffer.bits; 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 #if BITS_SAVED == 32
*file_buffer.pos++= (byte) (byte_buff >> 24) ; *file_buffer.pos++= (byte) (byte_buff >> 24) ;
*file_buffer.pos++= (byte) (byte_buff >> 16) ; *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 >> 8) ;
*file_buffer.pos++= (byte) byte_buff; *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_SAVED == 16
if (bits >= sizeof(uint)) if (bits >= sizeof(uint))
{ {