admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

mruby-io/io.c: fix issues with gets; fix #5913

Browse Source 
- gets with RS multiple times
- gets with RS with limit
- gets with limit bigger than buffer size
This commit is contained in:
Yukihiro "Matz" Matsumoto
2023-01-23 07:27:18 +09:00
parent be5266fbe6
commit aefc5befbd
1 changed files with 20 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mrbgems/mruby-io/src/io.c
+20 -31
View File
@@ -1714,10 +1714,10 @@ io_find_index(struct mrb_io *fptr, const char *rs, mrb_int rslen)
mrb_assert(rslen > 0);
const char c = rs[0];
const mrb_int limit = buf->len - rslen;
for (mrb_int i=buf->start; i<limit; i++) {
if (buf->mem[i] == c) {
if (memcmp(buf->mem+i, rs, rslen) == 0)
return i;
const char *p = buf->mem+buf->start;
for (mrb_int i=0; i<limit; i++) {
if (p[i] == c && (rslen == 1 || memcmp(p+i, rs, rslen) == 0)) {
return i;
}
}
return -1;
@@ -1783,36 +1783,25 @@ io_gets(mrb_state *mrb, mrb_value io)
outbuf = mrb_str_new(mrb, NULL, 0);
}
if (!rs_given) { /* no RS; only limit */
mrb_assert(limit_given);
for (;;) {
if (buf->len >= limit) {
for (;;) {
if (rs_given) { /* with RS */
int rslen = RSTRING_LEN(rs);
mrb_int idx = io_find_index(fptr, RSTRING_PTR(rs), rslen);
if (idx >= 0) { /* found */
mrb_int n = idx+rslen;
if (limit_given && limit < n) {
n = limit;
}
io_buf_cat(mrb, outbuf, fptr, n);
return outbuf;
}
}
if (limit_given) {
if (limit <= buf->len) {
io_buf_cat(mrb, outbuf, fptr, limit);
return outbuf;
}
io_buf_cat_all(mrb, outbuf, fptr);
io_buf_fill(mrb, fptr);
if (fptr->eof) {
if (RSTRING_LEN(outbuf) == 0) return mrb_nil_value();
return outbuf;
}
}
}
for (;;) { /* with RS */
int rslen = RSTRING_LEN(rs);
mrb_int idx = io_find_index(fptr, RSTRING_PTR(rs), rslen);
if (idx >= 0) { /* found */
mrb_int n = idx+rslen;
if (limit_given && limit < n) {
n = limit;
}
io_buf_cat(mrb, outbuf, fptr, n);
return outbuf;
}
if (limit_given && buf->len < limit) {
io_buf_cat(mrb, outbuf, fptr, limit);
return outbuf;
limit -= buf->len;
}
io_buf_cat_all(mrb, outbuf, fptr);
io_buf_fill(mrb, fptr);