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

Replace few instances of memcmp/memcpy in the code that should be grub_memcmp/grub_memcpy.

Browse source
This commit is contained in:
Vladimir Serbinenko 2014-04-04 07:58:42 +02:00
parent 9706066791
commit 8063ce197f
5 changed files with 12 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
grub-core/commands/acpihalt.c
View file

@ -214,8 +214,8 @@ get_sleep_type (grub_uint8_t *table, grub_uint8_t *ptr, grub_uint8_t *end,
}
case GRUB_ACPI_OPCODE_NAME:
ptr++;
if ((!scope || memcmp (scope, "\\", scope_len) == 0) &&
(memcmp (ptr, "_S5_", 4) == 0 || memcmp (ptr, "\\_S5_", 4) == 0))
if ((!scope || grub_memcmp (scope, "\\", scope_len) == 0) &&
(grub_memcmp (ptr, "_S5_", 4) == 0 || grub_memcmp (ptr, "\\_S5_", 4) == 0))
{
int ll;
grub_uint8_t *ptr2 = ptr;

4
grub-core/commands/legacycfg.c
View file

@ -580,7 +580,7 @@ check_password_md5_real (const char *entered,
GRUB_MD_MD5->write (ctx, entered, enteredlen);
digest = GRUB_MD_MD5->read (ctx);
GRUB_MD_MD5->final (ctx);
memcpy (alt_result, digest, MD5_HASHLEN);
grub_memcpy (alt_result, digest, MD5_HASHLEN);
GRUB_MD_MD5->init (ctx);
GRUB_MD_MD5->write (ctx, entered, enteredlen);
@ -596,7 +596,7 @@ check_password_md5_real (const char *entered,
for (i = 0; i < 1000; i++)
{
memcpy (alt_result, digest, 16);
grub_memcpy (alt_result, digest, 16);
GRUB_MD_MD5->init (ctx);
if ((i & 1) != 0)