Merge pull request #279 from Erant/master

Fix getFSF to abide by the function contract, Thanks @Erant
This commit is contained in:
zeroday 2015-03-15 14:55:17 +08:00
commit a1be293f15
1 changed files with 6 additions and 0 deletions

View File

@ -659,13 +659,19 @@ typedef struct LoadFSF {
static const char *getFSF (lua_State *L, void *ud, size_t *size) {
LoadFSF *lf = (LoadFSF *)ud;
(void)L;
if (L == NULL && size == NULL) // Direct mode check
return NULL;
if (lf->extraline) {
lf->extraline = 0;
*size = 1;
return "\n";
}
if (fs_eof(lf->f)) return NULL;
*size = fs_read(lf->f, lf->buff, sizeof(lf->buff));
return (*size > 0) ? lf->buff : NULL;
}