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

minor cleanups

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2011-06-26 17:18:53 +02:00
parent 80ca250565
commit a8fae12c5b
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
grub-core/net/tftp.c
View file

@ -131,8 +131,9 @@ tftp_receive (grub_net_socket_t sock, struct grub_net_buff *nb)
grub_netbuff_clear (nb); grub_netbuff_clear (nb);
break; break;
case TFTP_DATA: case TFTP_DATA:
if ((err = grub_netbuff_pull (nb, sizeof (tftph->opcode) + err = grub_netbuff_pull (nb, sizeof (tftph->opcode) +
sizeof (tftph->u.data.block))) != GRUB_ERR_NONE) sizeof (tftph->u.data.block));
if (err)
return err; return err;
if (grub_be_to_cpu16 (tftph->u.data.block) == data->block + 1) if (grub_be_to_cpu16 (tftph->u.data.block) == data->block + 1)
{ {
@ -142,8 +143,11 @@ tftp_receive (grub_net_socket_t sock, struct grub_net_buff *nb)
sock->status = 2; sock->status = 2;
/* Prevent garbage in broken cards. */ /* Prevent garbage in broken cards. */
if (size > 1024) if (size > 1024)
if ((err = grub_netbuff_unput (nb, size - 1024)) != GRUB_ERR_NONE) {
return err; err = grub_netbuff_unput (nb, size - 1024);
if (err)
return err;
}
} }
else else
grub_netbuff_clear (nb); grub_netbuff_clear (nb);