chaostheorie/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

decompressXZ: Ensure that lzma_end() is called

Browse source 
Otherwise we might leak memory.
This commit is contained in:
Eelco Dolstra 2016-02-15 21:26:28 +01:00
parent 03109e9580
commit bfdacb712c
1 changed files with 21 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/libutil/compression.cc
View file

@ -6,34 +6,43 @@
namespace nix { namespace nix {
/* RAII wrapper around lzma_stream. */
struct LzmaStream
{
lzma_stream strm;
LzmaStream() : strm(LZMA_STREAM_INIT) { };
~LzmaStream() { lzma_end(&strm); };
lzma_stream & operator()() { return strm; }
};
std::string decompressXZ(const std::string & in) std::string decompressXZ(const std::string & in)
{ {
lzma_stream strm = LZMA_STREAM_INIT; LzmaStream strm;
lzma_ret ret = lzma_stream_decoder( lzma_ret ret = lzma_stream_decoder(
&strm, UINT64_MAX, LZMA_CONCATENATED); &strm(), UINT64_MAX, LZMA_CONCATENATED);
if (ret != LZMA_OK) if (ret != LZMA_OK)
throw Error("unable to initialise lzma decoder"); throw Error("unable to initialise lzma decoder");
lzma_action action = LZMA_RUN; lzma_action action = LZMA_RUN;
uint8_t outbuf[BUFSIZ]; uint8_t outbuf[BUFSIZ];
string res; string res;
strm.next_in = (uint8_t *) in.c_str(); strm().next_in = (uint8_t *) in.c_str();
strm.avail_in = in.size(); strm().avail_in = in.size();
strm.next_out = outbuf; strm().next_out = outbuf;
strm.avail_out = sizeof(outbuf); strm().avail_out = sizeof(outbuf);
while (true) { while (true) {
if (strm.avail_in == 0) if (strm().avail_in == 0)
action = LZMA_FINISH; action = LZMA_FINISH;
lzma_ret ret = lzma_code(&strm, action); lzma_ret ret = lzma_code(&strm(), action);
if (strm.avail_out == 0 || ret == LZMA_STREAM_END) { if (strm().avail_out == 0 || ret == LZMA_STREAM_END) {
res.append((char *) outbuf, sizeof(outbuf) - strm.avail_out); res.append((char *) outbuf, sizeof(outbuf) - strm().avail_out);
strm.next_out = outbuf; strm().next_out = outbuf;
strm.avail_out = sizeof(outbuf); strm().avail_out = sizeof(outbuf);
} }
if (ret == LZMA_STREAM_END) if (ret == LZMA_STREAM_END)