libxc/unlz4: always set an error return code on failures
authorJan Beulich <JBeulich@suse.com>
Fri, 24 Jan 2014 08:01:21 +0000 (08:01 +0000)
committerIan Campbell <ian.campbell@citrix.com>
Tue, 28 Jan 2014 11:13:07 +0000 (11:13 +0000)
"ret", being set to -1 early on, gets cleared by the first invocation
of lz4_decompress()/lz4_decompress_unknownoutputsize(), and hence
subsequent failures wouldn't be noticed by the caller without setting
it back to -1 right after those calls.

Linux commit: 2a1d689c9ba42a6066540fb221b6ecbd6298b728

Reported-by: Matthew Daley <mattjd@gmail.com>
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
tools/libxc/xc_dom_decompress_lz4.c

index 47875359ab4057b978f645eb802437a73a617279..08272fe41fdbbe488ac8df0740cada43f99fbcf3 100644 (file)
@@ -98,6 +98,7 @@ int xc_try_lz4_decode(
                        goto exit_2;
                }
 
+               ret = -1;
                outp += dest_len;
                size -= chunksize;