(get_system_name): Don't crash if Vsystem_name does not contain a string.

1 files changed, 4 insertions, 1 deletions

diff --git a/src/editfns.c b/src/editfns.c
index c3d3eedccc0..cdcf0165b86 100644
--- a/src/editfns.c
+++ b/src/editfns.c
@@ -747,7 +747,10 @@ DEFUN ("system-name", Fsystem_name, Ssystem_name, 0, 0, 0,
 char *
 get_system_name ()
 {
-  return (char *) XSTRING (Vsystem_name)->data;
+  if (STRINGP (Vsystem_name))
+    return (char *) XSTRING (Vsystem_name)->data;
+  else
+    return "";
 }
 
 DEFUN ("emacs-pid", Femacs_pid, Semacs_pid, 0, 0, 0,