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

Merge pull request #592 from stoeckmann/oob

Browse Source 
Prevent out of boundary write on malicious input
This commit is contained in:
Eric Hawicz
2020-05-06 23:31:15 -04:00
committed by GitHub
parent 8e3d3d5544 d07b910149
commit 31243e4d12
3 changed files with 27 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
arraylist.c
View File

@@ -136,6 +136,9 @@ int array_list_del_idx(struct array_list *arr, size_t idx, size_t count)
{ {
size_t i, stop; size_t i, stop;
/* Avoid overflow in calculation with large indices. */
if (idx > SIZE_T_MAX - count)
return -1;
stop = idx + count; stop = idx + count;
if (idx >= arr->length || stop > arr->length) if (idx >= arr->length || stop > arr->length)
return -1; return -1;

10
linkhash.c
View File

@@ -12,6 +12,7 @@
#include "config.h" #include "config.h"
#include <assert.h>
#include <limits.h> #include <limits.h>
#include <stdarg.h> #include <stdarg.h>
#include <stddef.h> #include <stddef.h>
@@ -499,6 +500,8 @@ struct lh_table *lh_table_new(int size, lh_entry_free_fn *free_fn, lh_hash_fn *h
int i; int i;
struct lh_table *t; struct lh_table *t;
/* Allocate space for elements to avoid divisions by zero. */
assert(size > 0);
t = (struct lh_table *)calloc(1, sizeof(struct lh_table)); t = (struct lh_table *)calloc(1, sizeof(struct lh_table));
if (!t) if (!t)
return NULL; return NULL;
@@ -577,9 +580,12 @@ int lh_table_insert_w_hash(struct lh_table *t, const void *k, const void *v, con
{ {
unsigned long n; unsigned long n;
if (t->count >= t->size * LH_LOAD_FACTOR) if (t->count >= t->size * LH_LOAD_FACTOR) {
if (lh_table_resize(t, t->size * 2) != 0) /* Avoid signed integer overflow with large tables. */
int new_size = INT_MAX / 2 < t->size ? t->size * 2 : INT_MAX;
if (t->size == INT_MAX || lh_table_resize(t, new_size) != 0)
return -1; return -1;
}
n = h % t->size; n = h % t->size;

19
printbuf.c
View File

@@ -15,6 +15,7 @@
#include "config.h" #include "config.h"
#include <limits.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@@ -65,10 +66,16 @@ static int printbuf_extend(struct printbuf *p, int min_size)
if (p->size >= min_size) if (p->size >= min_size)
return 0; return 0;
/* Prevent signed integer overflows with large buffers. */
new_size = p->size * 2; if (min_size > INT_MAX - 8)
if (new_size < min_size + 8) return -1;
if (p->size > INT_MAX / 2)
new_size = min_size + 8; new_size = min_size + 8;
else {
new_size = p->size * 2;
if (new_size < min_size + 8)
new_size = min_size + 8;
}
#ifdef PRINTBUF_DEBUG #ifdef PRINTBUF_DEBUG
MC_DEBUG("printbuf_memappend: realloc " MC_DEBUG("printbuf_memappend: realloc "
"bpos=%d min_size=%d old_size=%d new_size=%d\n", "bpos=%d min_size=%d old_size=%d new_size=%d\n",
@@ -83,6 +90,9 @@ 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. */
if (size > INT_MAX - p->bpos - 1)
return -1;
if (p->size <= p->bpos + size + 1) if (p->size <= p->bpos + size + 1)
{ {
if (printbuf_extend(p, p->bpos + size + 1) < 0) if (printbuf_extend(p, p->bpos + size + 1) < 0)
@@ -100,6 +110,9 @@ 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. */
if (len > INT_MAX - offset)
return -1;
size_needed = offset + len; size_needed = offset + len;
if (pb->size < size_needed) if (pb->size < size_needed)
{ {