]> git.dujemihanovic.xyz Git - u-boot.git/commitdiff
fit: check return value of fit_image_get_data_size()
authorHeinrich Schuchardt <xypron.glpk@gmx.de>
Wed, 11 Mar 2020 20:51:08 +0000 (21:51 +0100)
committerTom Rini <trini@konsulko.com>
Fri, 13 Mar 2020 13:30:30 +0000 (09:30 -0400)
GCC-10 reports:

In file included from tools/common/image-fit.c:1:
include/image.h: In function ‘fit_image_get_data_and_size’:
./tools/../common/image-fit.c:1015:9: warning: ‘len’ may be used
uninitialized in this function [-Wmaybe-uninitialized]
 1015 |   *size = len;
      |   ~~~~~~^~~~~
./tools/../common/image-fit.c:996:6: note: ‘len’ was declared here
  996 |  int len;
      |      ^~~

Add the missing check of the return value of fit_image_get_data_size().

Fixes: c3c863880479 ("add FIT data-position & data-offset property support")
Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Reviewed-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>
common/image-fit.c

index f3bb00c98a55d966c3e68869bd180db8a6fefcc9..4435bc4f1d9389a34154ad5b835e2d67b656c364 100644 (file)
@@ -1011,8 +1011,10 @@ int fit_image_get_data_and_size(const void *fit, int noffset,
        if (external_data) {
                debug("External Data\n");
                ret = fit_image_get_data_size(fit, noffset, &len);
-               *data = fit + offset;
-               *size = len;
+               if (!ret) {
+                       *data = fit + offset;
+                       *size = len;
+               }
        } else {
                ret = fit_image_get_data(fit, noffset, data, size);
        }