Browse Source

BUG: fix segfault if FindFiles() is called without actual match pattern
(e.g. FILE(GLOB /usr/include) instead of FILE(GLOB /usr/include/* )
#4620

Alex

Alexander Neundorf 18 years ago
parent
commit
a8128f88b7
1 changed files with 9 additions and 2 deletions
  1. 9 2
      Source/kwsys/Glob.cxx

+ 9 - 2
Source/kwsys/Glob.cxx

@@ -253,8 +253,9 @@ void Glob::RecurseDirectory(kwsys_stl::string::size_type start,
 
     if ( !dir_only || !kwsys::SystemTools::FileIsDirectory(realname.c_str()) )
       {
-      if ( this->Internals->Expressions[
-        this->Internals->Expressions.size()-1].find(fname.c_str()) )
+      if ( (this->Internals->Expressions.size() > 0) && 
+           this->Internals->Expressions[
+             this->Internals->Expressions.size()-1].find(fname.c_str()) )
         {
         this->AddFile(this->Internals->Files, realname.c_str());
         }
@@ -277,6 +278,12 @@ void Glob::ProcessDirectory(kwsys_stl::string::size_type start,
     this->RecurseDirectory(start, dir, dir_only);
     return;
     }
+
+  if ( start >= this->Internals->Expressions.size() )
+    {
+    return;
+    }
+
   kwsys::Directory d;
   if ( !d.Load(dir.c_str()) )
     {