From 314b3e9d536c9bef602d01ae8d6800b3bccc6dcf Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Tue, 13 Dec 2016 15:50:23 +0100 Subject: [PATCH] UPSTREAM: libpayload/.../PDCurses: Improve compatibility with ncurses Coverity erroneously complains that we call wmove with x or y == -1, even though our copy of that function properly checks for that. But: setsyx is documented to always return OK (even on errors), so let it do that. (and make coverity happy in the process) BUG=None BRANCH=None TEST=None Signed-off-by: Patrick Georgi Found-by: Coverity Scan #1260797 Reviewed-on: https://review.coreboot.org/17836 Tested-by: build bot (Jenkins) Reviewed-by: Martin Roth Change-Id: I1bc9ba2a075037f0e1a855b67a93883978564887 Reviewed-on: https://chromium-review.googlesource.com/420838 Commit-Ready: Furquan Shaikh Tested-by: Furquan Shaikh Reviewed-by: Furquan Shaikh --- payloads/libpayload/curses/PDCurses/pdcurses/getyx.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/payloads/libpayload/curses/PDCurses/pdcurses/getyx.c b/payloads/libpayload/curses/PDCurses/pdcurses/getyx.c index 1c0391766c..0f39c48d35 100644 --- a/payloads/libpayload/curses/PDCurses/pdcurses/getyx.c +++ b/payloads/libpayload/curses/PDCurses/pdcurses/getyx.c @@ -135,9 +135,14 @@ int setsyx(int y, int x) curscr->_leaveit = TRUE; return OK; } + else if (y == -1 || x == -1) + { + return OK; + } else { curscr->_leaveit = FALSE; - return wmove(curscr, y, x); + wmove(curscr, y, x); + return OK; } }