From c84db4c0624f844d42e49d6e500d5517058c8ec3 Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Tue, 13 Dec 2016 15:47:22 +0100 Subject: [PATCH] UPSTREAM: 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. BUG=None BRANCH=None TEST=None Signed-off-by: Patrick Georgi Found-by: Coverity Scan #1261105 Reviewed-on: https://review.coreboot.org/17835 Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth Change-Id: I59aff77820c524fa5a0fcb251c1268da475101fb Reviewed-on: https://chromium-review.googlesource.com/420836 Commit-Ready: Furquan Shaikh Tested-by: Furquan Shaikh Reviewed-by: Furquan Shaikh --- 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 b5634c7c37..24c5fd29d3 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)