anth64/fpk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: use 64-bit seek, avoid 32-bit long truncation on large archives

Browse Source
This commit is contained in:
anth64
2026-09-15 10:51:55 +02:00
parent ebd3b0522f
commit c08d3b097a
1 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/fpk.c
+17 -5
View File
@@ -1,9 +1,21 @@
#if !defined(_WIN32)
#define _FILE_OFFSET_BITS 64
#define _POSIX_C_SOURCE 200809L
#endif
#include "fpk.h" #include "fpk.h"
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#if defined(_WIN32)
#define fpk_fseek64(f, off) _fseeki64((f), (off), SEEK_SET)
#else
#include <sys/types.h>
#define fpk_fseek64(f, off) fseeko((f), (off_t)(off), SEEK_SET)
#endif
#define FPK_HEADER_FIELD_ENTRY_COUNT 4 #define FPK_HEADER_FIELD_ENTRY_COUNT 4
#define FPK_HEADER_FIELD_DIR_OFFSET 12 #define FPK_HEADER_FIELD_DIR_OFFSET 12
#define FPK_HEADER_FIELD_STRTAB_OFFSET 20 #define FPK_HEADER_FIELD_STRTAB_OFFSET 20
@@ -104,7 +116,7 @@ struct fpk *fpk_open(const char *path)
fpk->strtab = malloc((size_t)strtab_size); fpk->strtab = malloc((size_t)strtab_size);
if (fpk->strtab == NULL) if (fpk->strtab == NULL)
goto fail; goto fail;
if (fseek(fpk->file, (long)strtab_offset, SEEK_SET) != 0) if (fpk_fseek64(fpk->file, strtab_offset) != 0)
goto fail; goto fail;
if (fread(fpk->strtab, 1, (size_t)strtab_size, fpk->file) != if (fread(fpk->strtab, 1, (size_t)strtab_size, fpk->file) !=
strtab_size) strtab_size)
@@ -113,7 +125,7 @@ struct fpk *fpk_open(const char *path)
fpk->entries = malloc((size_t)fpk->entry_count * sizeof(fpk_entry_t)); fpk->entries = malloc((size_t)fpk->entry_count * sizeof(fpk_entry_t));
if (fpk->entries == NULL) if (fpk->entries == NULL)
goto fail; goto fail;
if (fseek(fpk->file, (long)dir_offset, SEEK_SET) != 0) if (fpk_fseek64(fpk->file, dir_offset) != 0)
goto fail; goto fail;
for (i = 0; i < fpk->entry_count; i++) { for (i = 0; i < fpk->entry_count; i++) {
unsigned char rec[FPK_DIR_ENTRY_SIZE]; unsigned char rec[FPK_DIR_ENTRY_SIZE];
@@ -173,7 +185,7 @@ void *fpk_read(struct fpk *fpk, const fpk_entry_t *entry, size_t *out_size)
if (buf == NULL) if (buf == NULL)
goto out; goto out;
if (fseek(fpk->file, (long)entry->data_offset, SEEK_SET) != 0 || if (fpk_fseek64(fpk->file, entry->data_offset) != 0 ||
fread(buf, 1, (size_t)entry->data_size, fpk->file) != fread(buf, 1, (size_t)entry->data_size, fpk->file) !=
entry->data_size) { entry->data_size) {
free(buf); free(buf);
@@ -289,7 +301,7 @@ int fpk_writer_finalize(struct fpk_writer *w)
int ret = 0; int ret = 0;
strtab_offset = w->cursor; strtab_offset = w->cursor;
if (fseek(w->file, (long)strtab_offset, SEEK_SET) != 0) { if (fpk_fseek64(w->file, strtab_offset) != 0) {
ret = -1; ret = -1;
goto out; goto out;
} }
@@ -330,7 +342,7 @@ int fpk_writer_finalize(struct fpk_writer *w)
put_u64le(header + FPK_HEADER_FIELD_DIR_OFFSET, dir_offset); put_u64le(header + FPK_HEADER_FIELD_DIR_OFFSET, dir_offset);
put_u64le(header + FPK_HEADER_FIELD_STRTAB_OFFSET, strtab_offset); put_u64le(header + FPK_HEADER_FIELD_STRTAB_OFFSET, strtab_offset);
if (fseek(w->file, 0, SEEK_SET) != 0 || if (fpk_fseek64(w->file, 0) != 0 ||
fwrite(header, 1, FPK_HEADER_SIZE, w->file) != FPK_HEADER_SIZE || fwrite(header, 1, FPK_HEADER_SIZE, w->file) != FPK_HEADER_SIZE ||
fflush(w->file) != 0) fflush(w->file) != 0)
ret = -1; ret = -1;