root
/
xz
mirror of https://git.tukaani.org/xz.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Silence a bogus Valgrind warning. 

When using -O2 with GCC, it liked to swap two comparisons
in one "if" statement. It's otherwise fine except that
the latter part, which is seemingly never executed, got
executed (nothing wrong with that) and then triggered
warning in Valgrind about conditional jump depending on
uninitialized variable. A few people find this annoying
so do things a bit differently to avoid the warning.
This commit is contained in:
Lasse Collin 2010-06-02 23:09:22 +03:00
parent 29a7b250e6
commit b5fbab6123
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/liblzma/lz/lz_encoder.c
View File

@ -341,7 +341,7 @@ lz_encoder_prepare(lzma_mf *mf, lzma_allocator *allocator,
// Deallocate the old hash array if it exists and has different size // Deallocate the old hash array if it exists and has different size
// than what is needed now. // than what is needed now.
if (mf->hash != NULL && old_count != new_count) { if (old_count != new_count) {
lzma_free(mf->hash, allocator); lzma_free(mf->hash, allocator);
mf->hash = NULL; mf->hash = NULL;
} }
@ -444,6 +444,8 @@ lzma_lz_encoder_memusage(const lzma_lz_options *lz_options)
lzma_mf mf = { lzma_mf mf = {
.buffer = NULL, .buffer = NULL,
.hash = NULL, .hash = NULL,
.hash_size_sum = 0,
.sons_count = 0,
}; };
// Setup the size information into mf. // Setup the size information into mf.
@ -519,6 +521,8 @@ lzma_lz_encoder_init(lzma_next_coder *next, lzma_allocator *allocator,
next->coder->mf.buffer = NULL; next->coder->mf.buffer = NULL;
next->coder->mf.hash = NULL; next->coder->mf.hash = NULL;
next->coder->mf.hash_size_sum = 0;
next->coder->mf.sons_count = 0;
next->coder->next = LZMA_NEXT_CODER_INIT; next->coder->next = LZMA_NEXT_CODER_INIT;
} }