diff --git a/ChangeLog b/ChangeLog
index 31194e497..720b81b49 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-06-08  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/commands/wildcard.c (wildcard_expand): Set default return
+	value rather than let it uninited.
+
 2012-06-07  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/commands/wildcard.c (+check_file): New function.
diff --git a/grub-core/commands/wildcard.c b/grub-core/commands/wildcard.c
index 2680ccdb6..c98eed4da 100644
--- a/grub-core/commands/wildcard.c
+++ b/grub-core/commands/wildcard.c
@@ -475,6 +475,7 @@ wildcard_expand (const char *s, char ***strs)
   unsigned i;
   regex_t regexp;
 
+  *strs = 0;
   if (s[0] != '/' && s[0] != '(' && s[0] != '*')
     return 0;