#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
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;
}