From: Christian Heller Date: Tue, 27 Aug 2013 00:39:15 +0000 (+0200) Subject: Uise uint32_t to test for a value going beyond UINT16_MAX. X-Git-Tag: tce~1028 X-Git-Url: https://plomlompom.com/repos/%7B%7Bdb.prefix%7D%7D/%7B%7B%20web_path%20%7D%7D/decks/%7B%7Bprefix%7D%7D/processes?a=commitdiff_plain;h=e2d7d06f147ee15429053fd40ade631ac08d7e23;p=plomrogue Uise uint32_t to test for a value going beyond UINT16_MAX. --- diff --git a/src/windows.c b/src/windows.c index a7bf88f..6257d4b 100644 --- a/src/windows.c +++ b/src/windows.c @@ -365,23 +365,23 @@ static void shift_win_backward(struct WinMeta * wmeta) extern uint8_t init_win_meta(WINDOW * screen, struct WinMeta * wmeta) { wmeta->_screen = screen; - wmeta->padframe.size.y = getmaxy(screen); - wmeta->padframe.size.x = getmaxx(screen); - if ( wmeta->padframe.size.y > UINT16_MAX - || wmeta->padframe.size.x > UINT16_MAX) + uint32_t maxy_test = getmaxy(screen); + uint32_t maxx_test = getmaxx(screen); + if (maxy_test > UINT16_MAX || maxx_test > UINT16_MAX) { return 2; } + wmeta->padframe.size.y = maxy_test; + wmeta->padframe.size.x = maxx_test; wmeta->_chain_start = 0; wmeta->_chain_end = 0; wmeta->pad_offset = 0; - WINDOW * test; - test = newpad(wmeta->padframe.size.y, 1); - if (NULL == test) + WINDOW * pad_test = newpad(wmeta->padframe.size.y, 1); + if (NULL == pad_test) { return 1; } - wmeta->padframe.curses_win = test; + wmeta->padframe.curses_win = pad_test; wmeta->active = 0; return 0; }