Merged revision 1631730 from tomcat/trunk:
Avoid possible integer overflows reported by Coverity Scan


git-svn-id: https://svn.apache.org/repos/asf/tomcat/tc7.0.x/trunk@1631771 13f79535-47bb-0310-9956-ffa450edef68