diff options
Diffstat (limited to 'src/logic')
-rw-r--r-- | src/logic/pe_get_image_meta.c | 23 | ||||
-rw-r--r-- | src/logic/pe_map_raw_image.c | 24 |
2 files changed, 19 insertions, 28 deletions
diff --git a/src/logic/pe_get_image_meta.c b/src/logic/pe_get_image_meta.c index 350abe3..540ac87 100644 --- a/src/logic/pe_get_image_meta.c +++ b/src/logic/pe_get_image_meta.c @@ -2,7 +2,6 @@ #include <stdlib.h> #include <stdio.h> #include <string.h> -#include <errno.h> #include <perk/perk.h> #include "perk_impl.h" @@ -11,21 +10,19 @@ static int pe_free_image_meta_impl (struct pe_image_meta * meta, int status) { unsigned i; - if (!meta) return 0; + if (meta) { + for (i=0; i<meta->summary.num_of_implibs; i++) + free(meta->idata[i].items); - for (i=0; i<meta->summary.num_of_implibs; i++) - free(meta->idata[i].items); - - free(meta->idata); - free(meta->sectbl); - free(meta); - - return status; + free(meta->idata); + free(meta->sectbl); + free(meta); + } } -int pe_free_image_meta (struct pe_image_meta * meta) +void pe_free_image_meta (struct pe_image_meta * meta) { - return pe_free_image_meta_impl(meta,0); + pe_free_image_meta_impl(meta,0); } int pe_get_named_section_index (const struct pe_image_meta * m, const char * name) @@ -60,7 +57,7 @@ int pe_get_image_meta (const struct pe_raw_image * image, struct pe_image_meta * char * base = image->addr; if (!(m = calloc(1,sizeof(*m)))) - return errno; + return -1; m->ados = (struct pe_image_dos_hdr *)base; diff --git a/src/logic/pe_map_raw_image.c b/src/logic/pe_map_raw_image.c index caf14b9..5792f78 100644 --- a/src/logic/pe_map_raw_image.c +++ b/src/logic/pe_map_raw_image.c @@ -1,8 +1,7 @@ #include <stdint.h> +#include <stdbool.h> #include <unistd.h> #include <fcntl.h> -#include <limits.h> -#include <errno.h> #include <sys/mman.h> #include <sys/types.h> #include <sys/stat.h> @@ -11,30 +10,25 @@ int pe_map_raw_image (int fd, const char * fname, int prot, struct pe_raw_image * map) { - struct stat stat; - int nfd, ret; + struct stat stat; + bool fnew; - if ((nfd = !fd)) + if (fnew = (fd < 0)) fd = open(fname,O_RDONLY | O_CLOEXEC); if ((fd < 0) || (fstat(fd,&stat) < 0)) - return errno; + return -1; map->size = stat.st_size; map->addr = mmap(0,map->size,prot,MAP_PRIVATE,fd,0); - if (map->addr == MAP_FAILED) { - map->addr = 0; - ret = PERK_MAP_ERROR; - } else - ret = 0; + if (fnew) + close(fd); - if (nfd) close(fd); - - return ret; + return (map->addr == MAP_FAILED) ? -1 : 0; } int pe_unmap_raw_image (struct pe_raw_image * map) { - return munmap(map->addr, map->size); + return munmap(map->addr,map->size); } |