devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Lua fix failure to read lines longer than LUAL_BUFFERSIZE

Browse source 
Readline didn't handle lines longer than LUAL_BUFFERSIZE it now
reads these in chunks.

Change-Id: Iffe12447e5441ff6b479ce3de1d36df64c276183
This commit is contained in:
William Wilgus 2018-11-02 14:13:27 -04:00
parent f6e10b8488
commit d9f9def505
1 changed files with 10 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

23
apps/plugins/lua/liolib.c
View file

@ -269,22 +269,19 @@ static int _read_line (lua_State *L, int *f) {
luaL_buffinit(L, &b); luaL_buffinit(L, &b);
for (;;) { for (;;) {
size_t l; size_t l;
off_t r;
char *p = luaL_prepbuffer(&b); char *p = luaL_prepbuffer(&b);
r = rb->read_line(*f, p, LUAL_BUFFERSIZE); off_t r = rb->read_line(*f, p, LUAL_BUFFERSIZE); /* does not include `eol' */
if (r <= 0) { /* eof? */
luaL_pushresult(&b); /* close buffer */
return (lua_objlen(L, -1) > 0); /* check whether read something */
}
l = strlen(p); l = strlen(p);
luaL_addsize(&b, l);
if(r >= LUAL_BUFFERSIZE - 1)
continue; /* more to read */
if (l == 0 || p[l-1] != '\n') luaL_pushresult(&b); /* close buffer */
luaL_addsize(&b, l); return 1; /* we read at least 1 character */
else {
luaL_addsize(&b, l - 1); /* do not include `eol' */
luaL_pushresult(&b); /* close buffer */
return 1; /* read at least an `eol' */
}
if (r < LUAL_BUFFERSIZE) { /* eof? */
luaL_pushresult(&b); /* close buffer */
return (r > 0); /* check whether read something */
}
} }
} }