diff-delta: set size out-parameter to 0 for NULL delta
authorJeff King <peff@peff.net>
Thu, 5 Sep 2019 22:53:37 +0000 (18:53 -0400)
committerJunio C Hamano <gitster@pobox.com>
Fri, 6 Sep 2019 18:03:39 +0000 (11:03 -0700)
When we cannot generate a delta, we return NULL but leave delta_size
untouched. This is generally OK, as callers rely on NULL to decide if
the output is usable or not. But it can confuse compilers; in
particular, gcc 9.2.1 with "-flto -O3" complains in fast-import's
store_object() that delta_len may be used uninitialized.

Let's change the diff-delta code to set the size explicitly to 0 for a
NULL return. That silences the compiler and makes it easier to reason
about the result.

Reported-by: Stephan Beyer <s-beyer@gmx.net>
Helped-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff-delta.c
index e49643353bf56807b3d4ac4011784b5d8dd6f7a4..77fea08dfb04d3a6ec12e11dbd321084d9028722 100644 (file)
@@ -326,6 +326,8 @@ create_delta(const struct delta_index *index,
        const unsigned char *ref_data, *ref_top, *data, *top;
        unsigned char *out;
 
+       *delta_size = 0;
+
        if (!trg_buf || !trg_size)
                return NULL;