diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 152b2bc13af..21ae04b1f3a 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+Tue Feb  9 16:52:22 1999  Mumit Khan  <khan@xraylith.wisc.edu>
+
+	* gcc.c (convert_filename): Handle null filename argument.
+
 Wed Feb 10 15:46:10 1999  Michael Hayes  <m.hayes@elec.canterbury.ac.nz>
 
 	* config/c4x/c4x.md (*movhf_noclobber, *movhi_noclobber): Use
diff --git a/gcc/gcc.c b/gcc/gcc.c
index 18faad0e641..d269395dc98 100644
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
@@ -2393,7 +2393,12 @@ convert_filename (name, do_exe)
      int do_exe;
 {
   int i;
-  int len = strlen (name);
+  int len;
+
+  if (name == NULL)
+    return NULL;
+  
+  len = strlen (name);
 
 #ifdef HAVE_OBJECT_SUFFIX
   /* Convert x.o to x.obj if OBJECT_SUFFIX is ".obj".  */