From f23cbd0427826df18fb5d88685cfba88e1355ca3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Przemys=C5=82aw=20Czerpak?= <druzus@poczta.onet.pl>
Date: Tue, 5 May 2015 19:35:29 +0200
Subject: [PATCH] 2015-05-05 19:35 UTC+0200 Przemyslaw Czerpak
 (druzus/at/poczta.onet.pl)   * src/rtl/filebuf.c     ! fixed GPF when NULL
 filename is passed to Accept() method

  * include/hbclass.ch
    * indenting
---
 ChangeLog.txt      |  7 +++++++
 include/hbclass.ch |  2 +-
 src/rtl/filebuf.c  | 13 +++++++++----
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 08ff6f5847..cbbd4f2116 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -10,6 +10,13 @@
      * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
  */
 
+2015-05-05 19:35 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
+  * src/rtl/filebuf.c
+    ! fixed GPF when NULL filename is passed to Accept() method
+
+  * include/hbclass.ch
+    * indenting
+
 2015-05-04 12:41 UTC+0200 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
   * contrib/hbmemio/memio.c
     ! fixed GPF in hb_VFDirectory( "mem:..." ) - many thanks to Rolf for
diff --git a/include/hbclass.ch b/include/hbclass.ch
index b9a44fab65..f7947e7121 100644
--- a/include/hbclass.ch
+++ b/include/hbclass.ch
@@ -525,7 +525,7 @@ DECLARE HBClass ;
       SHARED clause and always create shared class variables */
    #xcommand CLASSDATA <DataNames,...> [ AS <type> ] [ INIT <uValue> ] [<export: EXPORTED, VISIBLE>] [<protect: PROTECTED>] [<hidde: HIDDEN>] [<ro: READONLY, RO>] [<share: SHARED>] [<persistent: PERSISTENT, PROPERTY>] [<sync: SYNC>] => ;
       _HB_MEMBER {[ AS <type>] <DataNames> } ;;
-   oClass:AddMultiClsData( <(type)>, <uValue>, __HB_CLS_SCOPE( <.export.>, <.protect.>, <.hidde.> ) + iif( <.ro.>, HB_OO_CLSTP_READONLY, 0 ) + iif( /* <.share.> */ .T., HB_OO_CLSTP_SHARED, 0 ) + iif( <.persistent.>, HB_OO_CLSTP_PERSIST, 0 ) + iif( <.sync.>, HB_OO_CLSTP_SYNC, 0 ), {<(DataNames)>}, __HB_CLS_NOINI )
+      oClass:AddMultiClsData( <(type)>, <uValue>, __HB_CLS_SCOPE( <.export.>, <.protect.>, <.hidde.> ) + iif( <.ro.>, HB_OO_CLSTP_READONLY, 0 ) + iif( /* <.share.> */ .T., HB_OO_CLSTP_SHARED, 0 ) + iif( <.persistent.>, HB_OO_CLSTP_PERSIST, 0 ) + iif( <.sync.>, HB_OO_CLSTP_SYNC, 0 ), {<(DataNames)>}, __HB_CLS_NOINI )
 
 #endif /* HB_CLS_FWO */
 
diff --git a/src/rtl/filebuf.c b/src/rtl/filebuf.c
index 81074c93ef..608af1c009 100644
--- a/src/rtl/filebuf.c
+++ b/src/rtl/filebuf.c
@@ -1050,12 +1050,17 @@ static int s_iFileTypes = 0;
 
 static int s_fileFindDrv( const char * pszFileName )
 {
-   int i = s_iFileTypes;
+   int i = -1;
 
-   while( --i >= 0 )
+   if( pszFileName )
    {
-      if( s_pFileTypes[ i ]->Accept( s_pFileTypes[ i ], pszFileName ) )
-         break;
+      i = s_iFileTypes;
+
+      while( --i >= 0 )
+      {
+         if( s_pFileTypes[ i ]->Accept( s_pFileTypes[ i ], pszFileName ) )
+            break;
+      }
    }
 
    return i;