mirror/mongoose
1
0
Fork 0
mirror of https://github.com/cesanta/mongoose.git synced 2024-11-25 11:39:01 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

(mg_fgets) Accept lines at the end not terminated by \n

Browse Source 
(mg_fgets) Don't consume more than size bytes when line cannot fit into buffer.
This commit is contained in:
Pavel Khlebovich 2013-08-12 14:27:20 +04:00
parent 5b84acbc14
commit 3d6b373c8f
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mongoose.c
View File

@ -2415,17 +2415,21 @@ static int parse_auth_header(struct mg_connection *conn, char *buf,
static char *mg_fgets(char *buf, size_t size, struct file *filep, char **p) { static char *mg_fgets(char *buf, size_t size, struct file *filep, char **p) {
char *eof; char *eof;
size_t len; size_t len;
char *memend;
if (filep->membuf != NULL && *p != NULL) { if (filep->membuf != NULL && *p != NULL) {
eof = (char *) memchr(*p, '\n', &filep->membuf[filep->size] - *p); memend = (char *) &filep->membuf[filep->size];
eof = (char *) memchr(*p, '\n', memend - *p); // Search for \n from p till the end of stream
if (eof != NULL) { if (eof != NULL) {
eof += 1; // Include \n eof += 1; // Include \n
len = (size_t) (eof - *p) > size - 1 ? size - 1 : (size_t) (eof - *p); } else {
memcpy(buf, *p, len); eof = memend; // Copy remaining data
buf[len] = '\0';
*p = eof;
} }
return eof; len = (size_t) (eof - *p) > size - 1 ? size - 1 : (size_t) (eof - *p);
memcpy(buf, *p, len);
buf[len] = '\0';
*p += len;
return len ? eof : NULL;
} else if (filep->fp != NULL) { } else if (filep->fp != NULL) {
return fgets(buf, size, filep->fp); return fgets(buf, size, filep->fp);
} else { } else {