From: Ahmad Fatoum <ahmad@a3f.at>
To: barebox@lists.infradead.org
Cc: afa@pengutronix.de
Subject: [PATCH 10/11] gui: png_lode: fix freeing of uninitialized pointer
Date: Thu, 22 Aug 2019 07:51:13 +0200 [thread overview]
Message-ID: <20190822055114.931-11-ahmad@a3f.at> (raw)
In-Reply-To: <20190822055114.931-1-ahmad@a3f.at>
If either calloc or png_uncompress_init fails, free(png) will free the
uninitialized png pointer. Avoid this and while at it postpone the
img allocation till after the early exit.
Signed-off-by: Ahmad Fatoum <ahmad@a3f.at>
---
lib/gui/png_lode.c | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/lib/gui/png_lode.c b/lib/gui/png_lode.c
index 477704d9768c..e30db0f853b3 100644
--- a/lib/gui/png_lode.c
+++ b/lib/gui/png_lode.c
@@ -46,15 +46,16 @@ struct image *png_open(char *inbuf, int insize)
LodePNGState state;
int ret;
unsigned error;
- struct image *img = calloc(1, sizeof(struct image));
- unsigned char *png;
-
- if (!img)
- return ERR_PTR(-ENOMEM);
+ struct image *img;
+ unsigned char *png = NULL;
ret = png_uncompress_init();
if (ret)
- goto err;
+ return ERR_PTR(ret);
+
+ img = calloc(1, sizeof(struct image));
+ if (!img)
+ return ERR_PTR(-ENOMEM);
lodepng_state_init(&state);
--
2.20.1
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2019-08-22 5:51 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-22 5:51 [PATCH 00/11] treewide: fix some ARCH=arm clang warnings Ahmad Fatoum
2019-08-22 5:51 ` [PATCH 01/11] linux/kbuild.h: sync with upstream Ahmad Fatoum
2019-08-26 10:35 ` Sascha Hauer
2019-09-09 9:57 ` Ahmad Fatoum
2019-08-22 5:51 ` [PATCH 02/11] ratp: fix use of %hu for printing int Ahmad Fatoum
2019-08-22 5:51 ` [PATCH 03/11] complete: remove unused variable Ahmad Fatoum
2019-08-22 6:08 ` Michael Olbrich
2019-08-22 6:22 ` Ahmad Fatoum
2019-08-22 6:32 ` [PATCH 1/2] fixup! " Ahmad Fatoum
2019-08-22 6:32 ` [PATCH 2/2] ata: fix mismatched header guards Ahmad Fatoum
2019-08-22 5:51 ` [PATCH 04/11] i2c-mux-pca954x: remove use of uninitialized variable Ahmad Fatoum
2019-08-22 5:51 ` [PATCH 05/11] net: phy: mv88e6xxx: remove duplicate member in struct initializer Ahmad Fatoum
2019-08-22 5:51 ` [PATCH 06/11] smc911x: fix inverted poll-for-ready Ahmad Fatoum
2019-08-22 5:51 ` [PATCH 07/11] nvme: use 64 bit types for timeouts even on 32 bit systems Ahmad Fatoum
2019-08-22 5:51 ` [PATCH 08/11] usb: gadget: fsl_udc: remove always-true null pointer checks Ahmad Fatoum
2019-08-22 5:51 ` [PATCH 09/11] commands: mmc_extcsd: describe missing bit Ahmad Fatoum
2019-08-22 5:51 ` Ahmad Fatoum [this message]
2019-08-22 5:51 ` [PATCH 11/11] fs: fat: fix use of wrong enumeration type Ahmad Fatoum
2019-08-22 6:38 ` [PATCH] ARM: don't use -no-thumb-interwork if unavailable Ahmad Fatoum
2019-08-23 7:20 ` [PATCH 00/11] treewide: fix some ARCH=arm clang warnings Sascha Hauer
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190822055114.931-11-ahmad@a3f.at \
--to=ahmad@a3f.at \
--cc=afa@pengutronix.de \
--cc=barebox@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox