Skip to content

Add additional input validation on rb_linebuf_get and change it to re… #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mannfredcom merged 1 commit into from
Feb 11, 2026
Merged

Add additional input validation on rb_linebuf_get and change it to re… #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion libratbox/include/rb_linebuf.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ void rb_linebuf_init(void);
void rb_linebuf_newbuf(rb_buf_head_t *);
void rb_linebuf_donebuf(rb_buf_head_t *);
int rb_linebuf_parse(rb_buf_head_t *, char *, size_t, bool);
ssize_t rb_linebuf_get(rb_buf_head_t * bufhead, char *buf, size_t buflen, bool partial, bool raw);
size_t rb_linebuf_get(rb_buf_head_t * bufhead, char *buf, size_t buflen, bool partial, bool raw);
void rb_linebuf_putmsg(rb_buf_head_t *, const char *, va_list *, const char *, ...);
void rb_linebuf_put(rb_buf_head_t *, const char *, ...);
void rb_linebuf_putbuf(rb_buf_head_t * bufhead, const char *buffer);
Expand Down
10 changes: 6 additions & 4 deletions libratbox/src/linebuf.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -439,7 +439,7 @@ rb_linebuf_parse(rb_buf_head_t * bufhead, char *data, size_t len, bool raw)
* get the next buffer from our line. For the time being it will copy
* data into the given buffer and free the underlying linebuf.
*/
ssize_t
size_t
rb_linebuf_get(rb_buf_head_t * bufhead, char *buf, size_t buflen, bool partial, bool raw)
{
rb_buf_line_t *bufline;
Expand All @@ -450,6 +450,10 @@ rb_linebuf_get(rb_buf_head_t * bufhead, char *buf, size_t buflen, bool partial,
if(bufhead->list.head == NULL)
return 0; /* Obviously not.. hrm. */

/* make sure we have a buffer */
if(buf == NULL || buflen == 0)
return 0;

bufline = bufhead->list.head->data;

/* make sure that the buffer was actually *terminated */
Expand Down Expand Up @@ -490,13 +494,11 @@ rb_linebuf_get(rb_buf_head_t * bufhead, char *buf, size_t buflen, bool partial,
if(raw == false)
buf[cpylen] = '\0';

lrb_assert(cpylen >= 0);

/* Deallocate the line */
rb_linebuf_done_line(bufhead, bufline, bufhead->list.head);

/* return how much we copied */
return (ssize_t)cpylen;
return cpylen;
}

/*
Expand Down