diff --git a/harbour/ChangeLog b/harbour/ChangeLog
index a7e956d72e..300f9a2d18 100644
--- a/harbour/ChangeLog
+++ b/harbour/ChangeLog
@@ -10,6 +10,18 @@
      * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
  */
 
+2012-11-20 17:44 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
+  * harbour/src/vm/cmdarg.c
+    ! fixed buffer overflow
+    ! added protection against GPF if hb_cmdargBaseProgName() is called
+      and there are no parameters initialized
+    * use macros to allocate system memory in MS-Windows builds
+
+  * harbour/src/vm/fm.c
+    * changed s_fInitedFM initialization when memory statistic is enabled
+      to avoid infinite recursion and GPF is some initialization function
+      tries to allocate memory
+
 2012-11-20 17:05 UTC+0100 Viktor Szakats (harbour syenar.net)
   * contrib/hbwin/tests/testsvc.prg
     + added some lines to test parameter passing
diff --git a/harbour/src/vm/cmdarg.c b/harbour/src/vm/cmdarg.c
index 6012e4054f..008f6b9c43 100644
--- a/harbour/src/vm/cmdarg.c
+++ b/harbour/src/vm/cmdarg.c
@@ -92,6 +92,9 @@ static HANDLE  s_hPrevInstance = 0;
 static int     s_iCmdShow      = 0;
 static HB_BOOL s_WinMainParam  = HB_FALSE;
 
+#define HB_WINARG_ALLOC( n )  HeapAlloc( GetProcessHeap(), 0, ( n ) )
+#define HB_WINARG_FREE( p )   HeapFree( GetProcessHeap(), 0, ( p ) )
+
 void hb_winmainArgVBuild( void )
 {
    LPCTSTR lpCmdLine, lpSrc;
@@ -100,9 +103,7 @@ void hb_winmainArgVBuild( void )
    HB_SIZE nSize, nModuleName;
    int iArgC;
    HB_BOOL fQuoted;
-   HANDLE hHeap;
 
-   hHeap = GetProcessHeap();
    lpCmdLine = GetCommandLine();
    nModuleName = GetModuleFileName( NULL, NULL, 0 );
    lpArgV = NULL;
@@ -114,9 +115,8 @@ void hb_winmainArgVBuild( void )
    {
       if( nSize != 0 )
       {
-         lpArgV = ( LPTSTR * ) HeapAlloc( hHeap, 0,
-                                          iArgC * sizeof( LPTSTR ) +
-                                          nSize * sizeof( TCHAR ) );
+         lpArgV = ( LPTSTR * ) HB_WINARG_ALLOC( iArgC * sizeof( LPTSTR ) +
+                                                nSize * sizeof( TCHAR ) );
          lpDst = ( LPTSTR ) ( lpArgV + iArgC );
          lpArgV[ 0 ] = lpDst;
          lpDst += nModuleName;
@@ -193,9 +193,8 @@ void hb_winmainArgVBuild( void )
       if( nModuleName != 0 )
       {
          iArgC = 1;
-         lpArgV = ( LPTSTR * ) HeapAlloc( hHeap, 0,
-                                          iArgC * sizeof( LPTSTR ) +
-                                          nModuleName * sizeof( TCHAR ) );
+         lpArgV = ( LPTSTR * ) HB_WINARG_ALLOC( iArgC * sizeof( LPTSTR ) +
+                                                nModuleName * sizeof( TCHAR ) );
          lpArgV[ 0 ] = ( LPTSTR ) ( lpArgV + iArgC );
       }
       else
@@ -228,14 +227,13 @@ void hb_winmainArgVBuild( void )
          for( iArgC = 0; iArgC < s_argc; ++iArgC )
             nSize += hb_wctomblen( s_lpArgV[ iArgC ] ) + 1;
 
-         s_lpArgVStr = ( LPSTR * ) HeapAlloc( hHeap, 0,
-                                              iArgC * sizeof( LPSTR ) +
-                                              nSize * sizeof( char ) );
-         lpStr = ( LPSTR ) ( s_lpArgVStr + iArgC );
+         s_lpArgVStr = ( LPSTR * ) HB_WINARG_ALLOC( s_argc * sizeof( LPSTR ) +
+                                                    nSize * sizeof( char ) );
+         lpStr = ( LPSTR ) ( s_lpArgVStr + s_argc );
          for( iArgC = 0; iArgC < s_argc; ++iArgC )
          {
             nSize = hb_wctomblen( s_lpArgV[ iArgC ] ) + 1;
-            hb_wcntombcpy( lpStr, s_lpArgV[ iArgC ], nSize );
+            hb_wcntombcpy( lpStr, s_lpArgV[ iArgC ], nSize - 1 );
             s_lpArgVStr[ iArgC ] = lpStr;
             lpStr += nSize;
          }
@@ -256,7 +254,7 @@ void hb_winmainArgVFree( void )
       {
          if( s_argv == s_lpArgVStr )
             s_argv = NULL;
-         HeapFree( GetProcessHeap(), 0, ( void * ) s_lpArgVStr );
+         HB_WINARG_FREE( ( void * ) s_lpArgVStr );
          s_lpArgVStr = NULL;
       }
 #else
@@ -264,7 +262,7 @@ void hb_winmainArgVFree( void )
          s_argv = NULL;
 #endif
 
-      HeapFree( GetProcessHeap(), 0, ( void * ) s_lpArgV );
+      HB_WINARG_FREE( ( void * ) s_lpArgV );
       s_lpArgV = NULL;
       s_argc = 0;
    }
@@ -644,14 +642,17 @@ char * hb_cmdargProgName( void )
 
 char * hb_cmdargBaseProgName( void )
 {
-   char * pszProgName, * pszBaseProgName;
-   PHB_FNAME pFileName;
+   char * pszProgName, * pszBaseProgName = NULL;
 
    pszProgName = hb_cmdargProgName();
-   pFileName = hb_fsFNameSplit( pszProgName );
-   pszBaseProgName = hb_strdup( pFileName->szName );
-   hb_xfree( pFileName );
-   hb_xfree( pszProgName );
+   if( pszProgName )
+   {
+      PHB_FNAME pFileName = hb_fsFNameSplit( pszProgName );
+
+      pszBaseProgName = hb_strdup( pFileName->szName );
+      hb_xfree( pFileName );
+      hb_xfree( pszProgName );
+   }
 
    return pszBaseProgName;
 }
diff --git a/harbour/src/vm/fm.c b/harbour/src/vm/fm.c
index bd8edd10ef..b10bd55923 100644
--- a/harbour/src/vm/fm.c
+++ b/harbour/src/vm/fm.c
@@ -1056,28 +1056,29 @@ void hb_xinit( void ) /* Initialize fixed memory subsystem */
 #ifdef HB_FM_NEED_INIT
    if( ! s_fInitedFM )
    {
-
-#ifdef HB_FM_STATISTICS
-      char buffer[ 5 ];
-
-      if( hb_getenv_buffer( "HB_FM_STAT", buffer, sizeof( buffer ) ) )
-      {
-         if( hb_stricmp( "yes", buffer ) == 0 )
-            s_fStatistic = HB_TRUE;
-         else if( hb_stricmp( "no", buffer ) == 0 )
-            s_fStatistic = HB_FALSE;
-      }
-#ifndef HB_FM_STATISTICS_DYN_OFF
-      else
-         s_fStatistic = HB_TRUE;  /* enabled by default */
-#endif /* HB_FM_STATISTICS_DYN_OFF */
-#endif /* HB_FM_STATISTICS */
-
-#if defined( HB_FM_HEAP_INIT )
-      s_hProcessHeap = GetProcessHeap();
-#endif
-
       s_fInitedFM = HB_TRUE;
+
+#  if defined( HB_FM_HEAP_INIT )
+      s_hProcessHeap = GetProcessHeap();
+#  endif
+
+#  ifdef HB_FM_STATISTICS
+      {
+         char buffer[ 5 ];
+
+         if( hb_getenv_buffer( "HB_FM_STAT", buffer, sizeof( buffer ) ) )
+         {
+            if( hb_stricmp( "yes", buffer ) == 0 )
+               s_fStatistic = HB_TRUE;
+            else if( hb_stricmp( "no", buffer ) == 0 )
+               s_fStatistic = HB_FALSE;
+         }
+#     ifndef HB_FM_STATISTICS_DYN_OFF
+         else
+            s_fStatistic = HB_TRUE;  /* enabled by default */
+#     endif /* HB_FM_STATISTICS_DYN_OFF */
+      }
+#  endif /* HB_FM_STATISTICS */
    }
 #endif /* HB_FM_NEED_INIT */
 }