sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

lzxpress: fix for decompression...

Browse Source 
Signed-off-by: Stefan Metzmacher <metze@samba.org>
(This used to be commit ee505df374)
This commit is contained in:
Matthieu Suiche 2008-07-10 09:31:43 +00:00 committed by Stefan Metzmacher
parent 14965b7260
commit 1825077840
2 changed files with 17 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
source4/lib/compression/lzxpress.c
View File

@ -32,7 +32,6 @@
*
*/
#include "includes.h"
#include "replace.h"
#include "lzxpress.h"
@ -57,10 +56,10 @@
))
#endif
static uint32_t xpress_decompress(uint8_t *input,
uint32_t input_size,
uint8_t *output,
uint32_t output_size)
ssize_t lzxpress_decompress(const uint8_t *input,
uint32_t input_size,
uint8_t *output,
uint32_t max_output_size)
{
uint32_t output_index, input_index;
uint32_t indicator, indicator_bit;
@ -112,11 +111,11 @@ static uint32_t xpress_decompress(uint8_t *input,
if (length == 15) {
length = input[input_index];
input_index += sizeof(uint8_t);
if (length == 255) {
length = PULL_LE_UINT16(input, input_index);
input_index += sizeof(uint16_t);
length -= (15 + 7);
}
if (length == 255) {
length = PULL_LE_UINT16(input, input_index);
input_index += sizeof(uint16_t);
length -= (15 + 7);
}
length += 15;
}
length += 7;
@ -125,20 +124,15 @@ static uint32_t xpress_decompress(uint8_t *input,
length += 3;
do {
if (output_index >= output_size) break;
if ((output_index >= max_output_size) || ((offset + 1) > output_index)) break;
output[output_index] = output[output_index - offset - 1];
output_index += sizeof(uint8_t);
length -= sizeof(uint8_t);
} while (length != 0);
}
} while ((output_index < output_size) && (input_index < input_size));
} while ((output_index < max_output_size) && (input_index < (input_size)));
return output_index;
}
uint32_t lzxpress_decompress(DATA_BLOB *inbuf,
DATA_BLOB *outbuf)
{
return xpress_decompress(inbuf->data, inbuf->length, outbuf->data, outbuf->length);
}

6
source4/lib/compression/lzxpress.h
View File

@ -37,7 +37,9 @@
#define XPRESS_BLOCK_SIZE 0x10000
uint32_t lzxpress_decompress(DATA_BLOB *inbuf,
DATA_BLOB *outbuf);
ssize_t lzxpress_decompress(const uint8_t *input,
uint32_t input_size,
uint8_t *output,
uint32_t max_output_size);
#endif /* _LZXPRESS_H */