2 files changed, 2 insertions, 2 deletions
diff --git a/locale/programs/localedef.c b/locale/programs/localedef.c
index f57c46714c..4f46d3d987 100644
--- a/locale/programs/localedef.c
+++ b/locale/programs/localedef.c
@@ -194,7 +194,7 @@ main (int argc, char *argv[])
 
   /* Add the first entry in the locale list.  */
   memset (&global, '\0', sizeof (struct localedef_t));
-  global.name = input_file;
+  global.name = input_file ?: "/dev/stdin";
   global.needed = ALL_LOCALES;
   locales = &global;
 
diff --git a/locale/programs/locfile.c b/locale/programs/locfile.c
index 4dafaef19f..7c724e292f 100644
--- a/locale/programs/locfile.c
+++ b/locale/programs/locfile.c
@@ -51,7 +51,7 @@ locfile_read (struct localedef_t *result, struct charmap_t *charmap)
   ldfile = lr_open (filename, locfile_hash);
   if (ldfile == NULL)
     {
-      if (filename[0] != '/')
+      if (filename != NULL && filename[0] != '/')
 	{
 	  char *i18npath = getenv ("I18NPATH");
 	  if (i18npath != NULL && *i18npath != '\0')