* grub-core/gnulib/argp-parse.c (__argp_input): Don't crash if pstate

	is NULL.

diff --git a/ChangeLog b/ChangeLog
index 3f4913ec1a44eecdc3dc11d86d2742d74c579224..b5ca76ac622b97f1f2533b462d3ae18f6196cd0a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-04-10  Colin Watson  <cjwatson@ubuntu.com>
+
+       * grub-core/gnulib/argp-parse.c (__argp_input): Don't crash if pstate
+       is NULL.
+
 2011-04-10  Vladimir Serbinenko  <phcoder@gmail.com>
 
        Dynamically count the number of lines for the lower banner.

diff --git a/grub-core/gnulib/argp-parse.c b/grub-core/gnulib/argp-parse.c
index a1cbf884e8a2771213301c8ef627fd6a2524d30d..9c054653c631c55031f56cba028cadbf7bf97c53 100644 (file)
--- a/grub-core/gnulib/argp-parse.c
+++ b/grub-core/gnulib/argp-parse.c
@@ -935,7 +935,7 @@ weak_alias (__argp_parse, argp_parse)
 void *
 __argp_input (const struct argp *argp, const struct argp_state *state)
 {
-  if (state)
+  if (state && state->pstate)
     {
       struct group *group;
       struct parser *parser = state->pstate;