Skip to content

Commit

Permalink
testcases passed (printbuffer default size 32/128)
Browse files Browse the repository at this point in the history
  • Loading branch information
@MiesSuomesta
MiesSuomesta committed Dec 19, 2019
1 parent d6b968d commit df95988
Show file tree
Hide file tree
Showing 3 changed files with 166 additions and 42 deletions.
91 changes: 66 additions & 25 deletions json_object.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -149,9 +149,9 @@ static int json_escape_str(struct printbuf *pb, const char *str, int len, int fl
str + start_offset,
pos - start_offset);
snprintf(sbuf, sizeof(sbuf),
"\\u00%c%c",
json_hex_chars[c >> 4],
json_hex_chars[c & 0xf]);
"\\u00%c%c",
json_hex_chars[c >> 4],
json_hex_chars[c & 0xf]);
printbuf_memappend_fast(pb, sbuf, (int) sizeof(sbuf) - 1);
start_offset = ++pos;
} else
Expand Down Expand Up @@ -220,14 +220,16 @@ static void json_object_generic_delete(struct json_object* jso)
lh_table_delete(json_object_table, jso);
#endif /* REFCOUNT_DEBUG */
printbuf_free(jso->_pb);
jso->_pb = NULL;
free(jso);
jso= NULL;
}

static struct json_object* json_object_new(enum json_type o_type)
{
struct json_object *jso;

jso = (struct json_object*)calloc(sizeof(struct json_object), 1);
jso = (struct json_object*)calloc(1, sizeof(struct json_object));
if (!jso)
return NULL;
jso->o_type = o_type;
Expand Down Expand Up @@ -325,24 +327,30 @@ const char* json_object_to_json_string_length(struct json_object *jso, int flags
const char *r = NULL;
size_t s = 0;

if (!jso)
{
s = 4;
r = "null";
}
else if ((jso->_pb) || (jso->_pb = printbuf_new()))
/* Failure case set first */
s = 4;
r = "null";

if (jso)
{
printbuf_reset(jso->_pb);
if ( jso->_pb == NULL )
jso->_pb = printbuf_new();

if(jso->_to_json_string(jso, jso->_pb, 0, flags) >= 0)
if ( jso->_pb != NULL )
{
s = (size_t)jso->_pb->bpos;
r = jso->_pb->buf;
printbuf_reset(jso->_pb);

if(jso->_to_json_string(jso, jso->_pb, 0, flags) >= 0)
{
s = (size_t)jso->_pb->bpos;
r = jso->_pb->buf;
}
}
}

if (length)
*length = s;

return r;
}

Expand Down Expand Up @@ -400,10 +408,12 @@ static int json_object_object_to_json_string(struct json_object* jso,
indent(pb, level+1, flags);
printbuf_strappend(pb, "\"");
json_escape_str(pb, iter.key, strlen(iter.key), flags);

if (flags & JSON_C_TO_STRING_SPACED)
printbuf_strappend(pb, "\": ");
else
printbuf_strappend(pb, "\":");

if(iter.val == NULL)
printbuf_strappend(pb, "null");
else
Expand Down Expand Up @@ -467,6 +477,19 @@ struct lh_table* json_object_get_object(const struct json_object *jso)
}
}

static char *stringdup(const char *s)
{
size_t len = strnlen (s, 1024) + 1;
char *new = malloc (len);

if (new == NULL)
return NULL;

new[len] = 0;
return (char *) memcpy (new, s, len);
}


int json_object_object_add_ex(struct json_object* jso,
const char *const key,
struct json_object *const val,
Expand All @@ -481,9 +504,9 @@ int json_object_object_add_ex(struct json_object* jso,
// We lookup the entry and replace the value, rather than just deleting
// and re-adding it, so the existing key remains valid.
hash = lh_get_hash(jso->o.c_object, (const void *)key);
existing_entry = (opts & JSON_C_OBJECT_ADD_KEY_IS_NEW) ? NULL :
lh_table_lookup_entry_w_hash(jso->o.c_object,
(const void *)key, hash);
existing_entry = (opts & JSON_C_OBJECT_ADD_KEY_IS_NEW) ?
NULL :
lh_table_lookup_entry_w_hash(jso->o.c_object, (const void *)key, hash);

// The caller must avoid creating loops in the object tree, but do a
// quick check anyway to make sure we're not creating a trivial loop.
Expand All @@ -492,17 +515,26 @@ int json_object_object_add_ex(struct json_object* jso,

if (!existing_entry)
{
const void *const k = (opts & JSON_C_OBJECT_KEY_IS_CONSTANT) ?
(const void *)key : strdup(key);
char *key_dup = stringdup(key);

/* key duplicate must be done first */
const void *const k = ((opts & JSON_C_OBJECT_KEY_IS_CONSTANT) ? (const void *)key : (const void *)key_dup);

/* key duplicate must be freed here if constant */
if (opts & JSON_C_OBJECT_KEY_IS_CONSTANT)
free(key_dup);

if (k == NULL)
return -1;

return lh_table_insert_w_hash(jso->o.c_object, k, val, hash, opts);
} else {
existing_value = (json_object *) lh_entry_v(existing_entry);
if (existing_value)
json_object_put(existing_value);
existing_entry->v = val;
return 0;
}
existing_value = (json_object *) lh_entry_v(existing_entry);
if (existing_value)
json_object_put(existing_value);
existing_entry->v = val;
return 0;
}

int json_object_object_add(struct json_object* jso, const char *key,
Expand Down Expand Up @@ -1491,7 +1523,15 @@ int json_object_deep_copy(struct json_object *src, struct json_object **dst, jso
int rc;

/* Check if arguments are sane ; *dst must not point to a non-NULL object */
if (!src || !dst || *dst) {
if (!src) {
errno = EINVAL;
return -1;
}
if (!dst) {
errno = EINVAL;
return -1;
}
if (*dst) {
errno = EINVAL;
return -1;
}
Expand All @@ -1501,6 +1541,7 @@ int json_object_deep_copy(struct json_object *src, struct json_object **dst, jso

rc = json_object_deep_copy_recursive(src, NULL, NULL, -1, dst, shallow_copy);
if (rc < 0) {

json_object_put(*dst);
*dst = NULL;
}
Expand Down
84 changes: 67 additions & 17 deletions printbuf.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,12 @@
#include "snprintf_compat.h"
#include "vasprintf_compat.h"

/* Default starting size of buffer and
* sprintbuf buffer
* */
#define PRINTBUF_DEFAULT_SIZE (32)
#define PRINTBUF_DEFAULT_SIZE_BUF (128)

static int printbuf_extend(struct printbuf *p, int min_size);

struct printbuf* printbuf_new(void)
Expand All @@ -38,9 +44,10 @@ struct printbuf* printbuf_new(void)

p = (struct printbuf*)calloc(1, sizeof(struct printbuf));
if(!p) return NULL;
p->size = 32;
p->size = PRINTBUF_DEFAULT_SIZE;
p->bpos = 0;
if(!(p->buf = (char*)malloc(p->size))) {
p->buf = (char*)calloc(1, p->size);
if(p->buf == NULL) {
free(p);
return NULL;
}
Expand All @@ -59,32 +66,60 @@ struct printbuf* printbuf_new(void)
*/
static int printbuf_extend(struct printbuf *p, int min_size)
{
char *t;
#define PRINTBUF_EXTEND_BY_BYTES_MIN (8)
char *t = NULL;
int new_size;

if (p->size >= min_size)
if(
(p != NULL) &&
(p->buf != NULL) &&
(p->size >= min_size)
)
return 0;

new_size = p->size * 2;
if (new_size < min_size + 8)
new_size = min_size + 8;

if (new_size < (min_size + PRINTBUF_EXTEND_BY_BYTES_MIN))
new_size = min_size + PRINTBUF_EXTEND_BY_BYTES_MIN;

#ifdef PRINTBUF_DEBUG
MC_DEBUG("printbuf_memappend: realloc "
"bpos=%d min_size=%d old_size=%d new_size=%d\n",
p->bpos, min_size, p->size, new_size);
#endif /* PRINTBUF_DEBUG */
if(!(t = (char*)realloc(p->buf, new_size)))

if (p != NULL)
{
t = (char*)calloc(1, new_size);
if ( (t != NULL) &&
(p->buf != NULL))
{
memcpy(t, p->buf, p->size);
}
}

if (t == NULL)
return -1;

p->size = new_size;
p->buf = t;

return 0;
}

int printbuf_memappend(struct printbuf *p, const char *buf, int size)
{

if ( (p->size > 0) && (p->buf == NULL)) {
int size_wanted = p->size;
p->size = 0;
if (printbuf_extend(p, size_wanted) < 0)
return -1;
}

if (p->size <= p->bpos + size + 1) {
if (printbuf_extend(p, p->bpos + size + 1) < 0)
return -1;
if (printbuf_extend(p, p->bpos + size + 1) < 0)
return -2;
}
memcpy(p->buf + p->bpos, buf, size);
p->bpos += size;
Expand Down Expand Up @@ -116,20 +151,20 @@ int sprintbuf(struct printbuf *p, const char *msg, ...)
{
va_list ap;
char *t;
int size;
char buf[128];
long int size;
char buf[PRINTBUF_DEFAULT_SIZE_BUF];

/* user stack buffer first */
va_start(ap, msg);
size = vsnprintf(buf, 128, msg, ap);
size = (long int)vsnprintf(buf, sizeof(buf), msg, ap);
va_end(ap);
/* if string is greater than stack buffer, then use dynamic string
with vasprintf. Note: some implementation of vsnprintf return -1
if output is truncated whereas some return the number of bytes that
would have been written - this code handles both cases. */
if(size == -1 || size > 127) {
if(size == -1 || size > (long int)sizeof(buf)) {
va_start(ap, msg);
if((size = vasprintf(&t, msg, ap)) < 0) { va_end(ap); return -1; }
if((size = (long int)vasprintf(&t, msg, ap)) < 0) { va_end(ap); return -1; }
va_end(ap);
printbuf_memappend(p, t, size);
free(t);
Expand All @@ -142,14 +177,29 @@ int sprintbuf(struct printbuf *p, const char *msg, ...)

void printbuf_reset(struct printbuf *p)
{
p->buf[0] = '\0';
p->bpos = 0;
if (p != NULL)
{
if ( (p->size > 0) &&
(p->buf != NULL)
)
{
p->buf[0] = '\0';
}

p->bpos = 0;
}
}

void printbuf_free(struct printbuf *p)
{
if(p) {
free(p->buf);

if (p->buf != NULL)
free(p->buf);

p->buf = NULL;

free(p);
p = NULL;
}
}
33 changes: 33 additions & 0 deletions test_printbuf.expected
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
test_basic_printbuf_memset: starting test
Buffer contents:blue:1xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
test_basic_printbuf_memset: end test
========================================
test_printbuf_memset_length: starting test
Buffer length: 0
Buffer length: 12
Buffer length: 18
Buffer length: 76
Buffer length: 76
Buffer length: 77
test_printbuf_memset_length: end test
========================================
test_printbuf_memappend: starting test
Buffer length: 0
Appended 32 bytes for resize: [xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx]
Partial append: 3, [blu]
With embedded \0 character: 4, [ab]
Append to just before resize: 31, [XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX]
Append to just after resize: 32, [XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX]
Buffer size after printbuf_strappend(): 16, [XXXXXXXXXXXXXXXX]
test_printbuf_memappend: end test
========================================
test_sprintbuf: starting test
Buffer length: 0
sprintbuf to just after resize(31+1): 32, [XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX], strlen(buf)=32
5, [plain]
6, [plain1]
16, [plain12147483647]
27, [plain12147483647-2147483648]
29, [plain12147483647-2147483648%s]
test_sprintbuf: end test
========================================

0 comments on commit df95988

Please sign in to comment.