vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

* grub-core/gettext/gettext.c (grub_gettext_pread): Fix the case when

Browse source 
len = 0.
	(grub_gettext_translate_real): Handle 0th string.
	(grub_gettext_translate): Ensure that "" isn't translated.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2012-04-04 14:41:55 +02:00
parent 505e41dc36
commit d61357cec2
2 changed files with 41 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -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

34
grub-core/gettext/gettext.c
View file

@ -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;