From 65ffb94fe14384bc45467916d1ac331b0f9a9aba Mon Sep 17 00:00:00 2001
From: rich_sposato <rich_sposato@7ec92016-0320-0410-acc4-a06ded1c099a>
Date: Wed, 20 Jul 2005 00:34:15 +0000
Subject: [PATCH] Fixed overflow bug in calculating number of blocks per Chunk.

git-svn-id: svn://svn.code.sf.net/p/loki-lib/code/trunk@153 7ec92016-0320-0410-acc4-a06ded1c099a
---
 MSVC/1300/SmallObj.cpp | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/MSVC/1300/SmallObj.cpp b/MSVC/1300/SmallObj.cpp
index 263b57c..7613723 100644
--- a/MSVC/1300/SmallObj.cpp
+++ b/MSVC/1300/SmallObj.cpp
@@ -13,7 +13,7 @@
 //     without express or implied warranty.
 ////////////////////////////////////////////////////////////////////////////////
 
-// Last update: July 18, 2005
+// $Header$
 
 
 #include "SmallObj.h"
@@ -245,7 +245,7 @@ void FixedAllocator::Initialize( std::size_t blockSize, std::size_t pageSize )
 
     std::size_t numBlocks = pageSize / blockSize;
     if (numBlocks > UCHAR_MAX) numBlocks = UCHAR_MAX;
-    else if (numBlocks == 0) numBlocks = 8 * blockSize;
+    else if ( numBlocks < 8 ) numBlocks = 8;
 
     numBlocks_ = static_cast<unsigned char>(numBlocks);
     assert(numBlocks_ == numBlocks);
@@ -591,6 +591,8 @@ void SmallObjAllocator::Deallocate( void * p, std::size_t numBytes )
     assert( found );
 }
 
+}; // end namespace Loki
+
 ////////////////////////////////////////////////////////////////////////////////
 // Change log:
 // March 20: fix exception safety issue in FixedAllocator::Allocate 
@@ -601,5 +603,7 @@ void SmallObjAllocator::Deallocate( void * p, std::size_t numBytes )
 // Jun 22, 2005: Fix in FixedAllocator::Allocate by Chad Lehman
 ////////////////////////////////////////////////////////////////////////////////
 
-}; // end namespace Loki
-
+// $Log$
+// Revision 1.9  2005/07/20 00:34:15  rich_sposato
+// Fixed overflow bug in calculating number of blocks per Chunk.
+//