Split the overflow check into explicit multiplication and addition overflow checks. TRAC #23671 Signed-off-by: Nicolas Capens Signed-off-by: Shannon Woods Author: Geoff Lang