From d61357cec252f2c80e68e3bcf8e124682db8eee9 Mon Sep 17 00:00:00 2001
From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Wed, 4 Apr 2012 14:41:55 +0200
Subject: [PATCH] 	* grub-core/gettext/gettext.c (grub_gettext_pread):
 Fix the case when 	len = 0. 	(grub_gettext_translate_real): Handle
 0th string. 	(grub_gettext_translate): Ensure that "" isn't translated.

---
 ChangeLog                   |  7 +++++++
 grub-core/gettext/gettext.c | 34 ++++++++++++++++++++++++++++++++++
 2 files changed, 41 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index ebd7ce7cf..a7ebd03a3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-04-04  Vladimir Serbinenko  <phcoder@gmail.com>
+
+	* grub-core/gettext/gettext.c (grub_gettext_pread): Fix the case when
+	len = 0.
+	(grub_gettext_translate_real): Handle 0th string.
+	(grub_gettext_translate): Ensure that "" isn't translated.
+
 2012-04-04  Vladimir Serbinenko  <phcoder@gmail.com>
 
 	* grub-core/disk/diskfilter.c (grub_diskfilter_memberlist): Add
diff --git a/grub-core/gettext/gettext.c b/grub-core/gettext/gettext.c
index b7ad956dc..569f98532 100644
--- a/grub-core/gettext/gettext.c
+++ b/grub-core/gettext/gettext.c
@@ -75,6 +75,8 @@ static grub_err_t
 grub_gettext_pread (grub_file_t file, void *buf, grub_size_t len,
 		    grub_off_t offset)
 {
+  if (len == 0)
+    return GRUB_ERR_NONE;
   if (grub_file_seek (file, offset) == (grub_off_t) - 1)
     return grub_errno;
   if (grub_file_read (file, buf, len) != (grub_ssize_t) len)
@@ -208,6 +210,35 @@ grub_gettext_translate_real (struct grub_gettext_context *ctx,
 	}
     }
 
+  if (current == 0 && ctx->grub_gettext_max != 0)
+    {
+      current_string = grub_gettext_getstring_from_position (ctx, 0);
+
+      if (!current_string)
+	{
+	  grub_errno = GRUB_ERR_NONE;
+	  grub_error_pop ();
+	  depth--;
+	  return NULL;
+	}
+
+      if (grub_strcmp (current_string, orig) == 0)
+	{
+	  const char *ret = 0;
+	  ret = grub_gettext_gettranslation_from_position (ctx, current);
+	  if (!ret)
+	    {
+	      grub_errno = GRUB_ERR_NONE;
+	      grub_error_pop ();
+	      depth--;
+	      return NULL;
+	    }
+	  grub_error_pop ();
+	  depth--;
+	  return ret;      
+	}
+    }
+
   grub_error_pop ();
   depth--;
   return NULL;
@@ -217,6 +248,9 @@ static const char *
 grub_gettext_translate (const char *orig)
 {
   const char *ret;
+  if (orig[0] == 0)
+    return orig;
+
   ret = grub_gettext_translate_real (&main_context, orig);
   if (ret)
     return ret;