Check for overflow in update size calculations

Check for overflow in update size calculations #1134