aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLasse Collin <lasse.collin@tukaani.org>2011-05-27 22:09:49 +0300
committerLasse Collin <lasse.collin@tukaani.org>2011-05-27 22:09:49 +0300
commit8bd91918ac50731f00b1a2a48072980572eb2ff9 (patch)
tree19672dc8bc7656f011f8590265c5fcb1c53d0e0e
parentBuild: Fix checking for system-provided SHA-256. (diff)
downloadxz-8bd91918ac50731f00b1a2a48072980572eb2ff9.tar.xz
liblzma: Handle allocation failures correctly in lzma_index_init().
Thanks to Jim Meyering.
Diffstat (limited to '')
-rw-r--r--src/liblzma/common/index.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/liblzma/common/index.c b/src/liblzma/common/index.c
index ddb9d364..9af4bc19 100644
--- a/src/liblzma/common/index.c
+++ b/src/liblzma/common/index.c
@@ -398,10 +398,13 @@ extern LZMA_API(lzma_index *)
lzma_index_init(lzma_allocator *allocator)
{
lzma_index *i = index_init_plain(allocator);
+ if (i == NULL)
+ return NULL;
+
index_stream *s = index_stream_init(0, 0, 1, 0, allocator);
- if (i == NULL || s == NULL) {
- index_stream_end(s, allocator);
+ if (s == NULL) {
lzma_free(i, allocator);
+ return NULL;
}
index_tree_append(&i->streams, &s->node);