From 7a7477c44a497ed04c9b677488bc42bce90b0831 Mon Sep 17 00:00:00 2001 From: Nick Bowler Date: Sun, 27 Feb 2022 15:10:40 -0500 Subject: [PATCH] Simplify libupkg package header decoding. Not only is this way a bit more readable than the older version, it also avoids tripping over a designated initializer bug in HP-UX cc. --- src/libupkg.c | 41 +++++++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 18 deletions(-) diff --git a/src/libupkg.c b/src/libupkg.c index f6de123..60dcab0 100644 --- a/src/libupkg.c +++ b/src/libupkg.c @@ -26,6 +26,16 @@ #define MIN(a, b) ((a) < (b) ? (a) : (b)) +#define UPKG_HDR_OFFSET_VERSION 4 +#define UPKG_HDR_OFFSET_LICENSE 6 +#define UPKG_HDR_OFFSET_FLAGS 8 +#define UPKG_HDR_OFFSET_NAME_COUNT 12 +#define UPKG_HDR_OFFSET_NAME_OFFSET 16 +#define UPKG_HDR_OFFSET_EXPORT_COUNT 20 +#define UPKG_HDR_OFFSET_EXPORT_OFFSET 24 +#define UPKG_HDR_OFFSET_IMPORT_COUNT 28 +#define UPKG_HDR_OFFSET_IMPORT_OFFSET 32 + /* * Print a message and execute some statement(s) if the expression evaluates * to zero. Intended to help verify that assumed constraints on the file @@ -134,26 +144,21 @@ size_t upkg_decode_index(long *val, const unsigned char *bytes, size_t n) static struct upkg_priv *init_upkg(const unsigned char *hdr) { - struct upkg_priv *pkg; + struct upkg_priv *pkg, tmp = {0}; + + tmp.pub.version = unpack_16_le(hdr+UPKG_HDR_OFFSET_VERSION); + tmp.pub.license = unpack_16_le(hdr+UPKG_HDR_OFFSET_LICENSE); + tmp.pub.flags = unpack_32_le(hdr+UPKG_HDR_OFFSET_FLAGS); + tmp.pub.name_count = unpack_32_le(hdr+UPKG_HDR_OFFSET_NAME_COUNT); + tmp.pub.export_count = unpack_32_le(hdr+UPKG_HDR_OFFSET_EXPORT_COUNT); + tmp.pub.import_count = unpack_32_le(hdr+UPKG_HDR_OFFSET_IMPORT_COUNT); + tmp.name_offset = unpack_32_le(hdr+UPKG_HDR_OFFSET_NAME_OFFSET); + tmp.export_offset = unpack_32_le(hdr+UPKG_HDR_OFFSET_EXPORT_OFFSET); + tmp.import_offset = unpack_32_le(hdr+UPKG_HDR_OFFSET_IMPORT_OFFSET); pkg = malloc(sizeof *pkg); - if (!pkg) - return NULL; - - *pkg = (struct upkg_priv) { - .pub = { - .version = unpack_16_le(hdr+4), - .license = unpack_16_le(hdr+6), - .flags = unpack_32_le(hdr+8), - .name_count = unpack_32_le(hdr+12), - .export_count = unpack_32_le(hdr+20), - .import_count = unpack_32_le(hdr+28), - }, - - .name_offset = unpack_32_le(hdr+16), - .export_offset = unpack_32_le(hdr+24), - .import_offset = unpack_32_le(hdr+32), - }; + if (pkg) + *pkg = tmp; return pkg; } -- 2.43.2