mirror/json-c
1
0
Fork 0
mirror of https://github.com/json-c/json-c.git synced 2026-04-05 21:39:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

printbuf: do not allow invalid arguments

Browse Source 
If invalid arguments are passed to printbuf functions return -1 to
protect printbuf internals.
This commit is contained in:
Tobias Stoeckmann
2022-03-03 21:15:19 +01:00
parent bd56cc8bf7
commit 4355242477
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
printbuf.c
View File

@@ -91,7 +91,7 @@ static int printbuf_extend(struct printbuf *p, int min_size)
int printbuf_memappend(struct printbuf *p, const char *buf, int size) int printbuf_memappend(struct printbuf *p, const char *buf, int size)
{ {
/* Prevent signed integer overflows with large buffers. */ /* Prevent signed integer overflows with large buffers. */
if (size > INT_MAX - p->bpos - 1) if (size < 0 || size > INT_MAX - p->bpos - 1)
return -1; return -1;
if (p->size <= p->bpos + size + 1) if (p->size <= p->bpos + size + 1)
{ {
@@ -111,7 +111,7 @@ int printbuf_memset(struct printbuf *pb, int offset, int charvalue, int len)
if (offset == -1) if (offset == -1)
offset = pb->bpos; offset = pb->bpos;
/* Prevent signed integer overflows with large buffers. */ /* Prevent signed integer overflows with large buffers. */
if (len > INT_MAX - offset) if (len < 0 || offset < -1 || len > INT_MAX - offset)
return -1; return -1;
size_needed = offset + len; size_needed = offset + len;
if (pb->size < size_needed) if (pb->size < size_needed)