simon987/libscan
1
0
Fork 0
mirror of https://github.com/simon987/libscan.git synced 2025-04-05 12:23:00 +00:00
Code Issues Projects Releases Wiki Activity

Fix for simon987/sist2#85

Browse Source
This commit is contained in:
simon987 2020-07-18 18:48:53 -04:00
parent de4d909ed5
commit 842d2c38e1
3 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libscan/arc/arc.c
View File

@ -5,6 +5,8 @@
#include <string.h>
#include <fcntl.h>
#define MAX_SUBFILE_SIZE (long)(10000000000)
int should_parse_filtered_file(const char *filepath, int ext) {
char tmp[PATH_MAX * 2];
@ -34,7 +36,13 @@ int should_parse_filtered_file(const char *filepath, int ext) {
}
int arc_read(struct vfile *f, void *buf, size_t size) {
return archive_read_data(f->arc, buf, size);
size_t read = archive_read_data(f->arc, buf, size);
if (read != size) {
return -1;
}
return read;
}
int arc_open(vfile_t *f, struct archive **a, arc_data_t *arc_data, int allow_recurse) {

6
libscan/font/font.c
View File

@ -143,9 +143,13 @@ void parse_font(scan_font_ctx_t *ctx, vfile_t *f, document_t *doc) {
FT_Init_FreeType(&ft_lib);
}
size_t buf_len;
size_t buf_len = 0;
void * buf = read_all(f, &buf_len);
if (buf == NULL) {
return;
}
FT_Face face;
FT_Error err = FT_New_Memory_Face(ft_lib, (unsigned char *) buf, buf_len, 0, &face);
if (err != 0) {

5
libscan/util.h
View File

@ -308,7 +308,10 @@ static void *read_all(vfile_t *f, size_t *size) {
void *buf = malloc(f->info.st_size);
*size = f->read(f, buf, f->info.st_size);
//TODO: log
if (*size != f->info.st_size) {
free(buf);
return NULL;
}
return buf;
}