Merge pull request #6 from coreos/gnu

Merge upstream GRUB changes
2014-11-23 17:58:18 -07:00 · 2014-11-23 17:58:18 -07:00 · b97f2fa47e
commit b97f2fa47e
parent d385aa5755 e2dd6daa8c
4 changed files with 25 additions and 5 deletions
--- a/grub-core/kern/efi/init.c
+++ b/grub-core/kern/efi/init.c
@ -63,10 +63,13 @@ grub_machine_get_bootlocation (char **device, char **path)
  if (!*device && grub_efi_net_config)
    grub_efi_net_config (image->device_handle, device, path);

-  /* Get the directory.  */
-  p = grub_strrchr (*path, '/');
-  if (p)
-    *p = '\0';
+  if (*path)
+    {
+      /* Get the directory.  */
+      p = grub_strrchr (*path, '/');
+      if (p)
+        *p = '\0';
+    }
 }

 void