diff options
| author | Steve Langasek <steve.langasek@canonical.com> | 2013-09-22 22:21:49 -0700 |
|---|---|---|
| committer | Peter Jones <pjones@redhat.com> | 2013-09-24 12:05:34 -0400 |
| commit | 3756f0b8e5cf0d1c0e430b060dc1558711daf53f (patch) | |
| tree | 24ecba2a7475b2db1d50457f99367fc8a20125b0 | |
| parent | e4642cca3869e017f35a7e662adb28d8957b9bbb (diff) | |
| download | efi-boot-shim-3756f0b8e5cf0d1c0e430b060dc1558711daf53f.tar.gz efi-boot-shim-3756f0b8e5cf0d1c0e430b060dc1558711daf53f.zip | |
Misc allocation cleanups
| -rw-r--r-- | netboot.c | 10 |
1 files changed, 6 insertions, 4 deletions
@@ -159,10 +159,9 @@ static char *get_v6_bootfile_url(EFI_PXE_BASE_CODE_DHCPV6_PACKET *pkt) if (ntohs(option->OpCode) == 59) { /* This is the bootfile url option */ urllen = ntohs(option->Length); - url = AllocatePool(urllen+2); + url = AllocateZeroPool(urllen+1); if (!url) return NULL; - memset(url, 0, urllen+2); memcpy(url, option->Data, urllen); return url; } @@ -274,10 +273,13 @@ static EFI_STATUS parseDhcp6() bootfile_url = get_v6_bootfile_url(packet); - if (extract_tftp_info(bootfile_url) == FALSE) - return EFI_NOT_FOUND; if (!bootfile_url) return EFI_NOT_FOUND; + if (extract_tftp_info(bootfile_url) == FALSE) { + FreePool(bootfile_url); + return EFI_NOT_FOUND; + } + FreePool(bootfile_url); return EFI_SUCCESS; } |