* grub-core/lib/cmdline.c (grub_loader_cmdline_size): Fix empty cmdline

	handling.

diff --git a/ChangeLog b/ChangeLog
index dfb1013c716620ad19a7db347ce6e568384a15a4..18ae47e545d9dbbdd1ec8099575ee346b30e07de 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2013-11-09  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * grub-core/lib/cmdline.c (grub_loader_cmdline_size): Fix empty cmdline
+       handling.
+
 2013-11-09  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/commands/i386/cmostest.c: Add new command "cmosset".

diff --git a/grub-core/lib/cmdline.c b/grub-core/lib/cmdline.c
index a702e648742fd30d90eca799524824fe21e54610..d5e10ee8798c856d640ec3a06fb42119eb5ab5fa 100644 (file)
--- a/grub-core/lib/cmdline.c
+++ b/grub-core/lib/cmdline.c
@@ -56,6 +56,9 @@ unsigned int grub_loader_cmdline_size (int argc, char *argv[])
       size++; /* Separator space or NULL.  */
     }
 
+  if (size == 0)
+    size = 1;
+
   return size;
 }