archive/blender-archive
Archived
1
1
Fork 0
Code Pull Requests Packages Activity

VSE: handle IO errors when reading disk cache header and version

Browse Source 
Respond to return values of `fscanf()` and `fread()` to detect and
handle I/O errors. Not only is error handling a good idea, this also
prevents warnings from GCC that `fread()` and `fscanf()` return values
are ignored.

Reviewed By: ISS

Differential Revision: https://developer.blender.org/D9915
This commit is contained in:
Sybren A. Stüvel
2020-12-22 11:43:33 +01:00
parent 0e85d701c6
commit 512a23c3d6
1 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
source/blender/sequencer/intern/image_cache.c
View File

@@ -425,7 +425,10 @@ static void seq_disk_cache_handle_versioning(SeqDiskCache *disk_cache)
FILE *file = BLI_fopen(path_version_file, "r"); FILE *file = BLI_fopen(path_version_file, "r");
if (file) { if (file) {
fscanf(file, "%d", &version); const int num_items_read = fscanf(file, "%d", &version);
if (num_items_read == 0) {
version = -1;
}
fclose(file); fclose(file);
} }
@@ -510,10 +513,14 @@ static size_t inflate_file_to_imbuf(ImBuf *ibuf, FILE *file, DiskCacheHeaderEntr
ibuf->rect_float, header_entry->size_raw, file, header_entry->offset); ibuf->rect_float, header_entry->size_raw, file, header_entry->offset);
} }
static void seq_disk_cache_read_header(FILE *file, DiskCacheHeader *header) static bool seq_disk_cache_read_header(FILE *file, DiskCacheHeader *header)
{ {
fseek(file, 0, 0); fseek(file, 0, 0);
fread(header, sizeof(*header), 1, file); const size_t num_items_read = fread(header, sizeof(*header), 1, file);
if (num_items_read < 1) {
perror("unable to read disk cache header");
return false;
}
for (int i = 0; i < DCACHE_IMAGES_PER_FILE; i++) { for (int i = 0; i < DCACHE_IMAGES_PER_FILE; i++) {
if ((ENDIAN_ORDER == B_ENDIAN) && header->entry[i].encoding == 0) { if ((ENDIAN_ORDER == B_ENDIAN) && header->entry[i].encoding == 0) {
@@ -523,6 +530,8 @@ static void seq_disk_cache_read_header(FILE *file, DiskCacheHeader *header)
BLI_endian_switch_uint64(&header->entry[i].size_raw); BLI_endian_switch_uint64(&header->entry[i].size_raw);
} }
} }
return true;
} }
static size_t seq_disk_cache_write_header(FILE *file, DiskCacheHeader *header) static size_t seq_disk_cache_write_header(FILE *file, DiskCacheHeader *header)
@@ -611,8 +620,12 @@ static bool seq_disk_cache_write_file(SeqDiskCache *disk_cache, SeqCacheKey *key
DiskCacheHeader header; DiskCacheHeader header;
memset(&header, 0, sizeof(header)); memset(&header, 0, sizeof(header));
seq_disk_cache_read_header(file, &header); if (!seq_disk_cache_read_header(file, &header)) {
fclose(file);
return false;
}
int entry_index = seq_disk_cache_add_header_entry(key, ibuf, &header); int entry_index = seq_disk_cache_add_header_entry(key, ibuf, &header);
size_t bytes_written = deflate_imbuf_to_file( size_t bytes_written = deflate_imbuf_to_file(
ibuf, file, seq_disk_cache_compression_level(), &header.entry[entry_index]); ibuf, file, seq_disk_cache_compression_level(), &header.entry[entry_index]);
@@ -644,7 +657,10 @@ static ImBuf *seq_disk_cache_read_file(SeqDiskCache *disk_cache, SeqCacheKey *ke
return NULL; return NULL;
} }
seq_disk_cache_read_header(file, &header); if (!seq_disk_cache_read_header(file, &header)) {
fclose(file);
return NULL;
}
int entry_index = seq_disk_cache_get_header_entry(key, &header); int entry_index = seq_disk_cache_get_header_entry(key, &header);
/* Item not found. */ /* Item not found. */