* win32-nat.c (register_loaded_dll): Handle case where FindFirstFile fails.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 063701cfc6f6d305ba6fe07684ed84b261be2fc0..e6cb3a0f5c39ef34801d676ec2506eb383907e50 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,8 @@
+2002-02-20  Christopher Faylor  <cgf@redhat.com>
+
+       * win32-nat.c (register_loaded_dll): Handle case where FindFirstFile
+       fails.
+
 2002-02-20  Daniel Jacobowitz  <drow@mvista.com>
 
        * jv-exp.y (parse_number): Change type of implicit longs

diff --git a/gdb/win32-nat.c b/gdb/win32-nat.c
index 610af6f74d2a3f6a720008ed4e16758d507d1106..871620fe386993ad639b8e35c153c712d9df51f2 100644 (file)
--- a/gdb/win32-nat.c
+++ b/gdb/win32-nat.c
@@ -582,16 +582,19 @@ register_loaded_dll (const char *name, DWORD load_addr)
   HANDLE h = FindFirstFile(name, &w32_fd);
   size_t len;
 
-  FindClose (h);
-  strcpy (buf, name);
-  if (GetCurrentDirectory (MAX_PATH + 1, cwd))
+  if (h)
     {
-      p = strrchr (buf, '\\');
-      if (p)
-       p[1] = '\0';
-      SetCurrentDirectory (buf);
-      GetFullPathName (w32_fd.cFileName, MAX_PATH, buf, &p);
-      SetCurrentDirectory (cwd);
+      FindClose (h);
+      strcpy (buf, name);
+      if (GetCurrentDirectory (MAX_PATH + 1, cwd))
+       {
+         p = strrchr (buf, '\\');
+         if (p)
+           p[1] = '\0';
+         SetCurrentDirectory (buf);
+         GetFullPathName (w32_fd.cFileName, MAX_PATH, buf, &p);
+         SetCurrentDirectory (cwd);
+       }
     }
 
   cygwin_conv_to_posix_path (buf, ppath);

diff --git a/gdb/windows-nat.c b/gdb/windows-nat.c
index 610af6f74d2a3f6a720008ed4e16758d507d1106..871620fe386993ad639b8e35c153c712d9df51f2 100644 (file)
--- a/gdb/windows-nat.c
+++ b/gdb/windows-nat.c
@@ -582,16 +582,19 @@ register_loaded_dll (const char *name, DWORD load_addr)
   HANDLE h = FindFirstFile(name, &w32_fd);
   size_t len;
 
-  FindClose (h);
-  strcpy (buf, name);
-  if (GetCurrentDirectory (MAX_PATH + 1, cwd))
+  if (h)
     {
-      p = strrchr (buf, '\\');
-      if (p)
-       p[1] = '\0';
-      SetCurrentDirectory (buf);
-      GetFullPathName (w32_fd.cFileName, MAX_PATH, buf, &p);
-      SetCurrentDirectory (cwd);
+      FindClose (h);
+      strcpy (buf, name);
+      if (GetCurrentDirectory (MAX_PATH + 1, cwd))
+       {
+         p = strrchr (buf, '\\');
+         if (p)
+           p[1] = '\0';
+         SetCurrentDirectory (buf);
+         GetFullPathName (w32_fd.cFileName, MAX_PATH, buf, &p);
+         SetCurrentDirectory (cwd);
+       }
     }
 
   cygwin_conv_to_posix_path (buf, ppath);