diff options
| author | Miod Vallat <miod@cvs.openbsd.org> | 2014-10-26 10:32:31 +0000 |
|---|---|---|
| committer | Miod Vallat <miod@cvs.openbsd.org> | 2014-10-26 10:32:31 +0000 |
| commit | dab5cdfadbe0a6c7d9a78cc429a5e28f25819840 (patch) | |
| tree | a456ed5f099f265ea0741a9e0cd728ebc72fb210 /sys/arch/hppa | |
| parent | 643e4d49461f9858253ded71ec0c336beaa937d9 (diff) | |
Don't forget to free() the malloc()s.
Diffstat (limited to 'sys/arch/hppa')
| -rw-r--r-- | sys/arch/hppa/stand/mkboot/mkboot.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sys/arch/hppa/stand/mkboot/mkboot.c b/sys/arch/hppa/stand/mkboot/mkboot.c index 0dd57973acb..5028c4225a5 100644 --- a/sys/arch/hppa/stand/mkboot/mkboot.c +++ b/sys/arch/hppa/stand/mkboot/mkboot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mkboot.c,v 1.19 2014/09/24 00:13:13 doug Exp $ */ +/* $OpenBSD: mkboot.c,v 1.20 2014/10/26 10:32:30 miod Exp $ */ /* * Copyright (c) 1990, 1993 @@ -197,10 +197,10 @@ putfile(char *from_file, int to) else if (IS_ELF(*(Elf32_Ehdr *)&ex)) { Elf32_Ehdr elf_header; Elf32_Phdr *elf_segments; - int i,header_count, memory_needed, elf_load_image_segment; + int i, header_count, memory_needed, elf_load_image_segment; (void) lseek(from, 0, SEEK_SET); - n = read(from, &elf_header, sizeof (elf_header)); + n = read(from, &elf_header, sizeof(elf_header)); if (n != sizeof (elf_header)) err(1, "%s: reading ELF header", from_file); header_count = ntohs(elf_header.e_phnum); @@ -221,12 +221,13 @@ putfile(char *from_file, int to) errx(1, "%s: more than one ELF program segment", from_file); elf_load_image_segment = i; } - if (elf_load_image_segment == -1) - errx(1, "%s: no suitable ELF program segment", from_file); } + if (elf_load_image_segment == -1) + errx(1, "%s: no suitable ELF program segment", from_file); entry = ntohl(elf_header.e_entry) + ntohl(elf_segments[elf_load_image_segment].p_offset) - ntohl(elf_segments[elf_load_image_segment].p_vaddr); + free(elf_segments); } else if (*(u_char *)&ex == 0x1f && ((u_char *)&ex)[1] == 0x8b) { entry = 0; } else |