2009-12-27 Vladimir Serbinenko <phcoder@gmail.com>

	* kern/parser.c (grub_parser_split_cmdline): Don't dereference NULL.

diff --git a/ChangeLog b/ChangeLog
index b6d1f02cc9d59486da1f38e4e01a7614d2762216..70e24ef1535c31b36288b87befdd53507c4ad5c4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2009-12-27  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       * kern/parser.c (grub_parser_split_cmdline): Don't dereference NULL.
+
 2009-12-27  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * normal/menu_text.c (grub_print_message_indented): Prevent

diff --git a/kern/parser.c b/kern/parser.c
index 006d67da717b7b613895bc6453d3465df2a1f2d7..dd4608ba9023125be009f70a184a77796f2e887e 100644 (file)
--- a/kern/parser.c
+++ b/kern/parser.c
@@ -145,13 +145,16 @@ grub_parser_split_cmdline (const char *cmdline, grub_reader_getline_t getline,
   *argc = 0;
   do
     {
-      if (! *rd)
+      if (! rd || !*rd)
        {
          if (getline)
            getline (&rd, 1);
          else break;
        }
 
+      if (!rd)
+       break;
+
       for (; *rd; rd++)
        {
          grub_parser_state_t newstate;