[Box Backup-dev] COMMIT r230 - box/trunk/lib/common

[boxbackup-dev@fluffy.co.uk]

Author: martin
Date: 2005-12-14 23:19:45 +0000 (Wed, 14 Dec 2005)
New Revision: 230

Modified:
   box/trunk/lib/common/ConversionString.cpp
Log:
Fix assert on 64 bit

Modified: box/trunk/lib/common/ConversionString.cpp
===================================================================
--- box/trunk/lib/common/ConversionString.cpp	2005-12-14 22:27:32 UTC (rev 229)
+++ box/trunk/lib/common/ConversionString.cpp	2005-12-14 23:19:45 UTC (rev 230)
@@ -72,11 +72,17 @@
 	{
 	case 32:
 		{
-			// No extra checking needed, if this assert holds true
-			ASSERT(sizeof(long) == sizeof(int32_t));
+			// No extra checking needed if long is an int32
+			if(sizeof(long) > sizeof(int32_t))
+			{
+				if(r <= (0 - 0x7fffffffL) || r > 0x7fffffffL)
+				{
+					THROW_EXCEPTION(ConversionException, IntOverflowInConvertFromString)
+				}
+			}
+			break;
 		}
-		break;
-		
+
 	case 16:
 		{
 			if(r <= (0 - 0x7fff) || r > 0x7fff)