gbdev/rgbds
1
0
Fork 0
mirror of https://github.com/gbdev/rgbds.git synced 2025-11-20 10:12:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle zero-byte files gracefully

Browse Source
This commit is contained in:
Jakub Kądziołka
2019-07-03 16:28:51 +02:00
parent 0d97b58265
commit df15c97b6e
4 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/asm/lexer.c
View File

@@ -184,9 +184,13 @@ YY_BUFFER_STATE yy_create_buffer(FILE *f)
// If ftell errored or the block above wasn't executed // If ftell errored or the block above wasn't executed
if (capacity == -1) if (capacity == -1)
capacity = 4096; capacity = 4096;
// Handle 0-byte files gracefully
else if (capacity == 0)
capacity = 1;
while (!feof(f)) { while (!feof(f)) {
if (buf == NULL || size >= capacity) { if (buf == NULL || size >= capacity) {
if (buf)
capacity *= 2; capacity *= 2;
/* Give extra room for 2 newlines and terminator */ /* Give extra room for 2 newlines and terminator */
buf = realloc(buf, capacity + SAFETYMARGIN + 3); buf = realloc(buf, capacity + SAFETYMARGIN + 3);
@@ -199,7 +203,7 @@ YY_BUFFER_STATE yy_create_buffer(FILE *f)
char *bufpos = buf + SAFETYMARGIN + size; char *bufpos = buf + SAFETYMARGIN + size;
size_t read_count = fread(bufpos, 1, capacity - size, f); size_t read_count = fread(bufpos, 1, capacity - size, f);
if (read_count == 0) if (read_count == 0 && !feof(f))
fatalerror("%s: fread error", __func__); fatalerror("%s: fread error", __func__);
size += read_count; size += read_count;
@@ -211,6 +215,12 @@ YY_BUFFER_STATE yy_create_buffer(FILE *f)
pBuffer->pBuffer[size] = 0; pBuffer->pBuffer[size] = 0;
pBuffer->nBufferSize = size; pBuffer->nBufferSize = size;
/* This is added here to make the buffer scaling above easy to express,
* while taking the newline space into account
* for the `yy_buffer_append`s below.
*/
capacity += 3;
/* Convert all line endings to LF and spaces */ /* Convert all line endings to LF and spaces */
char *mem = pBuffer->pBuffer; char *mem = pBuffer->pBuffer;

0
test/asm/zero-byte-file.asm Normal file
View File

0
test/asm/zero-byte-file.out Normal file
View File

0
test/asm/zero-byte-file.out.pipe Normal file
View File