[coreboot-gerrit] Patch set updated for coreboot: libpayload/.../PDCurses: avoid reading orig before NULL checking it
Patrick Georgi (pgeorgi@google.com)
gerrit at coreboot.org
Wed Dec 14 08:58:22 CET 2016
Patrick Georgi (pgeorgi at google.com) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/17835
-gerrit
commit c00c36f84d54ce53f6012714ddb6c5cb003980bb
Author: Patrick Georgi <pgeorgi at chromium.org>
Date: Tue Dec 13 15:47:22 2016 +0100
libpayload/.../PDCurses: avoid reading orig before NULL checking it
Coverity complains and that (unfortunately) means that some compiler
might take advantage of the same fact.
Change-Id: I59aff77820c524fa5a0fcb251c1268da475101fb
Signed-off-by: Patrick Georgi <pgeorgi at chromium.org>
Found-by: Coverity Scan #1261105
---
payloads/libpayload/curses/PDCurses/pdcurses/window.c | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/payloads/libpayload/curses/PDCurses/pdcurses/window.c b/payloads/libpayload/curses/PDCurses/pdcurses/window.c
index b5634c7..24c5fd2 100644
--- a/payloads/libpayload/curses/PDCurses/pdcurses/window.c
+++ b/payloads/libpayload/curses/PDCurses/pdcurses/window.c
@@ -294,9 +294,7 @@ int mvwin(WINDOW *win, int y, int x)
WINDOW *subwin(WINDOW *orig, int nlines, int ncols, int begy, int begx)
{
WINDOW *win;
- int i;
- int j = begy - orig->_begy;
- int k = begx - orig->_begx;
+ int i, j, k;
PDC_LOG(("subwin() - called: lines %d cols %d begy %d begx %d\n",
nlines, ncols, begy, begx));
@@ -308,6 +306,9 @@ WINDOW *subwin(WINDOW *orig, int nlines, int ncols, int begy, int begx)
(begx + ncols) > (orig->_begx + orig->_maxx))
return (WINDOW *)NULL;
+ j = begy - orig->_begy;
+ k = begx - orig->_begx;
+
if (!nlines)
nlines = orig->_maxy - 1 - j;
if (!ncols)
More information about the coreboot-gerrit
mailing list