Fix #1288 - better mg_iobuf_append allocation strategy

This commit is contained in:
cpq committed 2021-05-29 09:44:07 +01:00
1 parent c0a8546330
commit 9d68e20dcc
3 files changed
+23 -8

No files matched your search

+7 -4
View File
@@ -1533,10 +1533,13 @@ int mg_iobuf_init(struct mg_iobuf *io, size_t size) {
size_t mg_iobuf_append(struct mg_iobuf *io, const void *buf, size_t len, size_t mg_iobuf_append(struct mg_iobuf *io, const void *buf, size_t len,
size_t chunk_size) { size_t chunk_size) {
size_t new_size = io->len + len + chunk_size; size_t new_size = io->len + len;
new_size -= new_size % chunk_size; if (new_size > io->size) {
if (new_size != io->size) mg_iobuf_resize(io, new_size); new_size += chunk_size;
if (new_size != io->size) len = 0; // Realloc failure, append nothing new_size -= new_size % chunk_size;
if (new_size != io->size) mg_iobuf_resize(io, new_size);
if (new_size != io->size) len = 0; // Realloc failure, append nothing
}
if (buf != NULL) memmove(io->buf + io->len, buf, len); if (buf != NULL) memmove(io->buf + io->len, buf, len);
io->len += len; io->len += len;
return len; return len;
+9
View File
@@ -127,7 +127,16 @@
#include <stdarg.h> #include <stdarg.h>
#include <stdbool.h> #include <stdbool.h>
#include <stdint.h> #include <stdint.h>
#if defined(__GNUC__)
#include <sys/time.h> #include <sys/time.h>
#else
typedef long suseconds_t;
struct timeval {
time_t tv_sec;
suseconds_t tv_usec;
};
#endif
#if MG_ENABLE_FS #if MG_ENABLE_FS
#include <sys/stat.h> #include <sys/stat.h>
+7 -4
View File
@@ -44,10 +44,13 @@ int mg_iobuf_init(struct mg_iobuf *io, size_t size) {
size_t mg_iobuf_append(struct mg_iobuf *io, const void *buf, size_t len, size_t mg_iobuf_append(struct mg_iobuf *io, const void *buf, size_t len,
size_t chunk_size) { size_t chunk_size) {
size_t new_size = io->len + len + chunk_size; size_t new_size = io->len + len;
new_size -= new_size % chunk_size; if (new_size > io->size) {
if (new_size != io->size) mg_iobuf_resize(io, new_size); new_size += chunk_size;
if (new_size != io->size) len = 0; // Realloc failure, append nothing new_size -= new_size % chunk_size;
if (new_size != io->size) mg_iobuf_resize(io, new_size);
if (new_size != io->size) len = 0; // Realloc failure, append nothing
}
if (buf != NULL) memmove(io->buf + io->len, buf, len); if (buf != NULL) memmove(io->buf + io->len, buf, len);
io->len += len; io->len += len;
return len; return len;