Issue #9530:  Fix a couple of places where undefined behaviour can
occur, as a result of signed integer overflow.
1 file changed