diff options
| author | Denys Fedoryshchenko <denys.f@collabora.com> | 2026-10-28 18:01:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-10-28 18:01:05 +0200 |
| commit | 0e392406411d25270f5ab1df86eceda4b3ec8d5d (patch) | |
| tree | e5405db640768f550e50420a1f13bef3404f5ac3 /accel-pppd/logs/log_pgsql.c | |
| parent | b8a3c54aa34434312aa0053686ec37a133fb54e6 (diff) | |
| parent | 58e399400c4ef4b71472ab7c2c71c54a677a05a8 (diff) | |
| download | accel-ppp-0e392406411d25270f5ab1df86eceda4b3ec8d5d.tar.gz accel-ppp-0e392406411d25270f5ab1df86eceda4b3ec8d5d.zip | |
Merge pull request #374 from nuclearcat/fix/log-line-bound
log: bound log lines and share target unpacking
Diffstat (limited to 'accel-pppd/logs/log_pgsql.c')
| -rw-r--r-- | accel-pppd/logs/log_pgsql.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/accel-pppd/logs/log_pgsql.c b/accel-pppd/logs/log_pgsql.c index 6589da0e..0fae52bc 100644 --- a/accel-pppd/logs/log_pgsql.c +++ b/accel-pppd/logs/log_pgsql.c @@ -53,17 +53,12 @@ static int need_close; static void unpack_msg(struct log_msg_t *msg) { - struct log_chunk_t *chunk; - int pos = 0; + int pos = log_unpack_msg(msg, log_buf, LOG_MAX_SIZE); - list_for_each_entry(chunk, msg->chunks, entry) { - memcpy(log_buf + pos, chunk->msg, chunk->len); - pos += chunk->len; - } - if (pos > 1) - log_buf[pos - 1] = 0; - else - log_buf[0] = 0; + /* a line cut to fit the buffer has lost its newline */ + if (pos && log_buf[pos - 1] == '\n') + pos--; + log_buf[pos] = 0; } static void set_hdr(struct log_msg_t *msg, struct ap_session *ses) |