From 8395d89309242075db33d5881f54cedceab19427 Mon Sep 17 00:00:00 2001 From: Mike Lin Date: Sat, 8 Jan 2022 01:17:14 -1000 Subject: [PATCH] fix \r\r\n --- kstring.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/kstring.c b/kstring.c index 6c3fcaa1ba..653212210d 100644 --- a/kstring.c +++ b/kstring.c @@ -312,14 +312,15 @@ int kgetline3(kstring_t *s, kgets_func2 *fgets_fn, void *fp) int kgetline2(kstring_t *s, kgets_func2 *fgets_fn, void *fp) { + size_t l0 = s->l; int ret = kgetline3(s, fgets_fn, fp); if (ret < 0) { return ret; } - if (s->l && s->s[s->l-1] == '\n') { + if (s->l > l0 && s->s[s->l-1] == '\n') { s->l--; - if (s->l && s->s[s->l-1] == '\r') s->l--; + if (s->l > l0 && s->s[s->l-1] == '\r') s->l--; } s->s[s->l] = '\0'; return 0;