2009-11-26 12:18 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)

* harbour/src/vm/fm.c
    ! fixed stupid typo I made just before recent commit which caused
      GPF when not all mspaces where initialized
This commit is contained in:
Przemyslaw Czerpak
2009-11-26 11:18:25 +00:00
parent 9b085ea675
commit 852ab436f3
2 changed files with 13 additions and 5 deletions

View File

@@ -17,6 +17,11 @@
past entries belonging to author(s): Viktor Szakats.
*/
2009-11-26 12:18 UTC+0100 Przemyslaw Czerpak (druzus/at/priv.onet.pl)
* harbour/src/vm/fm.c
! fixed stupid typo I made just before recent commit which caused
GPF when not all mspaces where initialized
2009-11-26 02:27 UTC-0800 Pritpal Bedi (pritpal@vouchcac.com)
* contrib/hbqt/hbqt_slots.cpp
* contrib/hbqt/hbqt_slots.h

View File

@@ -421,7 +421,7 @@ static void * hb_mspace_update( void * pAlloc, int iCount )
{
PHB_MSPACE pm = ( PHB_MSPACE ) pAlloc;
if( pm->count > iCount )
if( pm && pm->count > iCount )
{
pAlloc = ( void * ) hb_mspace_alloc();
pm->count--;
@@ -518,10 +518,13 @@ void hb_xclean( void )
for( i = imax = icount = 0; i < HB_MSPACE_COUNT; ++i )
{
icount += s_mspool[ i ].count;
if( imax < s_mspool[ i ].count )
imax = s_mspool[ i ].count;
mspace_trim( s_mspool[ i ].ms, 0 );
if( s_mspool[ i ].ms )
{
icount += s_mspool[ i ].count;
if( imax < s_mspool[ i ].count )
imax = s_mspool[ i ].count;
mspace_trim( s_mspool[ i ].ms, 0 );
}
}
icount = ( icount + HB_MSPACE_COUNT - 1 ) / HB_MSPACE_COUNT;
if( imax > icount )