* grub-core/tests/video_checksum.c: Increase robustness to out of memory

condition.
	* grub-core/tests/fake_input.c: Likewise.
	* grub-core/tests/cmdline_cat_test.c: Likewise.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2013-10-03 23:38:18 +02:00
parent e44b9a8349
commit d71b45ae8e
4 changed files with 35 additions and 13 deletions

View file

@ -26,6 +26,7 @@ GRUB_MOD_LICENSE ("GPLv3+");
static int *seq;
static int seqptr, nseq;
static struct grub_term_input *saved;
static int fake_input;
static int
fake_getkey (struct grub_term_input *term __attribute__ ((unused)))
@ -44,23 +45,28 @@ static struct grub_term_input fake_input_term =
void
grub_terminal_input_fake_sequence (int *seq_in, int nseq_in)
{
if (!saved)
if (!fake_input)
saved = grub_term_inputs;
if (seq)
grub_free (seq);
seq = grub_malloc (nseq_in * sizeof (seq[0]));
if (seq)
{
grub_term_inputs = &fake_input_term;
grub_memcpy (seq, seq_in, nseq_in * sizeof (seq[0]));
}
if (!seq)
return;
grub_term_inputs = &fake_input_term;
grub_memcpy (seq, seq_in, nseq_in * sizeof (seq[0]));
nseq = nseq_in;
seqptr = 0;
fake_input = 1;
}
void
grub_terminal_input_fake_sequence_end (void)
{
if (!fake_input)
return;
fake_input = 0;
grub_term_inputs = saved;
grub_free (seq);
seq = 0;