mirror of
https://github.com/json-c/json-c.git
synced 2026-03-19 21:19:06 +08:00
Issue #599: Fix the backwards check in lh_table_insert_w_hash() that was preventing adding more than 11 objects.
Add a test to check for this too.
This commit is contained in:
@@ -582,7 +582,7 @@ int lh_table_insert_w_hash(struct lh_table *t, const void *k, const void *v, con
|
||||
|
||||
if (t->count >= t->size * LH_LOAD_FACTOR) {
|
||||
/* Avoid signed integer overflow with large tables. */
|
||||
int new_size = INT_MAX / 2 < t->size ? t->size * 2 : INT_MAX;
|
||||
int new_size = (t->size > INT_MAX / 2) ? INT_MAX : (t->size * 2);
|
||||
if (t->size == INT_MAX || lh_table_resize(t, new_size) != 0)
|
||||
return -1;
|
||||
}
|
||||
|
||||
@@ -3,8 +3,10 @@
|
||||
*/
|
||||
|
||||
#include "config.h"
|
||||
#include <assert.h>
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
|
||||
#include "json_inttypes.h"
|
||||
#include "json_object.h"
|
||||
@@ -24,6 +26,30 @@ void print_hex(const char *s)
|
||||
putchar('\n');
|
||||
}
|
||||
|
||||
static void test_lot_of_adds(void);
|
||||
static void test_lot_of_adds()
|
||||
{
|
||||
int ii;
|
||||
char key[50];
|
||||
json_object *jobj = json_object_new_object();
|
||||
assert(jobj != NULL);
|
||||
for (ii = 0; ii < 500; ii++)
|
||||
{
|
||||
snprintf(key, sizeof(key), "k%d", ii);
|
||||
json_object *iobj = json_object_new_int(ii);
|
||||
assert(iobj != NULL);
|
||||
if (json_object_object_add(jobj, key, iobj))
|
||||
{
|
||||
fprintf(stderr, "FAILED to add object #%d\n", ii);
|
||||
abort();
|
||||
}
|
||||
}
|
||||
printf("%s\n", json_object_to_json_string(jobj));
|
||||
assert(json_object_object_length(jobj) == 500);
|
||||
json_object_put(jobj);
|
||||
}
|
||||
|
||||
|
||||
int main(void)
|
||||
{
|
||||
const char *input = "\"\\ud840\\udd26,\\ud840\\udd27,\\ud800\\udd26,\\ud800\\udd27\"";
|
||||
@@ -52,5 +78,8 @@ int main(void)
|
||||
retval = 1;
|
||||
}
|
||||
json_object_put(parse_result);
|
||||
|
||||
test_lot_of_adds();
|
||||
|
||||
return retval;
|
||||
}
|
||||
|
||||
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user