The R Project SVN – R – Diff – /trunk/src/extra/xz/common/stream_decoder.c

 		if (coder->pos < coder->block_options.header_size)
 			return LZMA_OK;
 		coder->pos = 0;
+		// Version 0 is currently the only possible version.
+		coder->block_options.version = 0;
 		// Set up a buffer to hold the filter chain. Block Header
 		// decoder will initialize all members of this array so
 		// we don't need to do it here.
 		lzma_filter filters[LZMA_FILTERS_MAX + 1];
 		coder->block_options.filters = filters;
 	default:
 		assert(0);
 		return LZMA_PROG_ERROR;
+	}
-	return LZMA_OK;
+	// Never reached
+}
 static void
 stream_decoder_end(lzma_coder *coder, lzma_allocator *allocator)
 static lzma_ret
 stream_decoder_memconfig(lzma_coder *coder, uint64_t *memusage,
 		uint64_t *old_memlimit, uint64_t new_memlimit)
+{
-	if (new_memlimit != 0 && new_memlimit < coder->memusage)
-		return LZMA_MEMLIMIT_ERROR;
 	*memusage = coder->memusage;
 	*old_memlimit = coder->memlimit;
+	if (new_memlimit != 0) {
+		if (new_memlimit < coder->memusage)
+			return LZMA_MEMLIMIT_ERROR;
-	coder->memlimit = new_memlimit;
+		coder->memlimit = new_memlimit;
+	}
 	return LZMA_OK;
+}

The R Project SVN R