return &alloc->pkg;
}
+static int pkg_init_guid(struct upkg *pkg)
+{
+ size_t rc;
+
+ if (pkg->version < 68) {
+ unsigned long heritage_count, heritage_offset;
+ unsigned char buf[8];
+
+ rc = fread(buf, 1, sizeof buf, pkg->priv->f);
+ if (rc < 8)
+ return -1;
+
+ heritage_count = unpack_32_le(buf+0);
+ heritage_offset = unpack_32_le(buf+4);
+
+ if (heritage_count == 0)
+ return -1;
+ if (fseek(pkg->priv->f, heritage_offset, SEEK_SET) != 0)
+ return -1;
+ }
+
+ rc = fread(pkg->guid, 1, 16, pkg->priv->f);
+ if (rc < 16)
+ return -1;
+
+ return 0;
+}
+
static int pkg_init_names(struct upkg *pkg)
{
size_t rc, len, nbuf = 0;
unsigned long index = 0;
- char buf[512];
+ unsigned char buf[512];
if (fseek(pkg->priv->f, pkg->priv->name_offset, SEEK_SET) != 0)
return -1;
memmove(buf, buf+len+1, nbuf);
index++;
} else {
- char *c = memchr(buf, 0, nbuf);
+ unsigned char *c = memchr(buf, 0, nbuf);
if (!c || nbuf <= c - buf + 5)
goto err;
len = c - buf + 1;
{
size_t rc, len, nbuf = 0;
unsigned long index = 0;
- char buf[512];
+ unsigned char buf[512];
if (fseek(pkg->priv->f, pkg->priv->export_offset, SEEK_SET) != 0)
return -1;
export->flags = unpack_32_le(buf+len);
len += 4;
- rc = upkg_decode_index(&export->size, buf+len, nbuf-len);
- if (rc == 0) goto err;
+ rc = upkg_decode_index(&tmp, buf+len, nbuf-len);
+ if (rc == 0 || tmp < 0) goto err;
+ export->size = tmp;
len += rc;
if (export->size) {
- rc = upkg_decode_index(&export->offset, buf+len, nbuf-len);
- if (rc == 0) goto err;
+ rc = upkg_decode_index(&tmp, buf+len, nbuf-len);
+ if (rc == 0 || tmp < 0) goto err;
+ export->offset = tmp;
len += rc;
}
{
size_t rc, len, nbuf = 0;
unsigned long index = 0;
- char buf[512];
+ unsigned char buf[512];
if (fseek(pkg->priv->f, pkg->priv->import_offset, SEEK_SET) != 0)
return -1;
}
pkg->priv->f = f;
+ if (pkg_init_guid(pkg) != 0) {
+ goto err2;
+ }
+
if (pkg_init_names(pkg) != 0) {
goto err2;
}
.pkg = pkg,
.base = pkg->priv->exports[idx].offset,
.len = pkg->priv->exports[idx].size,
+ .name = pkg->priv->exports[idx].name,
};
return f;
break;
}
- if (rc == 0)
+ if (rc == 0) {
f->pkg->priv->last_file = f;
+ f->offset = offset;
+ f->eof = 0;
+ } else if (f->pkg->priv->last_file == f) {
+ f->pkg->priv->last_file = NULL;
+ }
+
return rc;
}
rc = fread(buf, 1, want, f->pkg->priv->f);
f->offset += rc;
+
+ if (want < n || (rc < want && feof(f->pkg->priv->f)))
+ f->eof = 1;
return rc;
}