mirror of
https://github.com/samba-team/samba.git
synced 2025-01-12 09:18:10 +03:00
ndr_compression: fix the build after lzxpress_decompress() prototype change
metze
(This used to be commit b36056aac3
)
This commit is contained in:
parent
1825077840
commit
6e0335f864
@ -276,6 +276,7 @@ static enum ndr_err_code ndr_pull_compression_xpress_chunk(struct ndr_pull *ndrp
|
||||
uint32_t plain_chunk_offset;
|
||||
uint32_t comp_chunk_size;
|
||||
uint32_t plain_chunk_size;
|
||||
ssize_t ret;
|
||||
|
||||
NDR_CHECK(ndr_pull_uint32(ndrpull, NDR_SCALARS, &plain_chunk_size));
|
||||
if (plain_chunk_size > 0x00010000) {
|
||||
@ -299,7 +300,16 @@ static enum ndr_err_code ndr_pull_compression_xpress_chunk(struct ndr_pull *ndrp
|
||||
plain_chunk_size, plain_chunk_size, comp_chunk_size, comp_chunk_size));
|
||||
|
||||
/* Uncompressing the buffer using LZ Xpress algorithm */
|
||||
lzxpress_decompress(&comp_chunk, &plain_chunk);
|
||||
ret = lzxpress_decompress(comp_chunk.data,
|
||||
comp_chunk.length,
|
||||
plain_chunk.data,
|
||||
plain_chunk.length);
|
||||
if (ret < 0) {
|
||||
return ndr_pull_error(ndrpull, NDR_ERR_COMPRESSION,
|
||||
"XPRESS lzxpress_decompress() returned %d\n",
|
||||
ret);
|
||||
}
|
||||
plain_chunk.length = ret;
|
||||
|
||||
if ((plain_chunk_size < 0x00010000) || (ndrpull->offset+4 >= ndrpull->data_size)) {
|
||||
/* this is the last chunk */
|
||||
|
Loading…
Reference in New Issue
Block a user