Please review: [Bug 622628] fix coverity Defect Type: Integer handling issues