Nothing was appended to strbuffer, so the buffer was left empty. An
empty strbuffer is not an empty string but NULL, so the result was a
segfault.
This patch fixes the problem by initializing strbuffer to an empty
string.
strbuffer_t strbuff;
char *result;
strbuffer_t strbuff;
char *result;
- strbuffer_init(&strbuff);
+ if(strbuffer_init(&strbuff))
+ return NULL;
if(do_dump(json, flags, 0, dump_to_strbuffer, (void *)&strbuff))
return NULL;
if(do_dump(json, flags, 0, dump_to_strbuffer, (void *)&strbuff))
return NULL;
size_t length;
json_t *result = NULL;
size_t length;
json_t *result = NULL;
- strbuffer_init(&strbuff);
+ if(strbuffer_init(&strbuff))
+ return NULL;
ssize_t length;
json_t *result = NULL;
ssize_t length;
json_t *result = NULL;
- strbuffer_init(&strbuff);
+ if(strbuffer_init(&strbuff))
+ return NULL;
#define STRBUFFER_MIN_SIZE 16
#define STRBUFFER_FACTOR 2
#define STRBUFFER_MIN_SIZE 16
#define STRBUFFER_FACTOR 2
-void strbuffer_init(strbuffer_t *strbuff)
+int strbuffer_init(strbuffer_t *strbuff)
+ strbuff->size = STRBUFFER_MIN_SIZE;
+
+ strbuff->value = malloc(strbuff->size);
+ if(!strbuff->value)
+ return -1;
+
+ memset(strbuff->value, 0, strbuff->size);
+ return 0;
}
void strbuffer_close(strbuffer_t *strbuff)
{
free(strbuff->value);
}
void strbuffer_close(strbuffer_t *strbuff)
{
free(strbuff->value);
- strbuffer_init(strbuff);
+ strbuff->size = 0;
+ strbuff->length = 0;
+ strbuff->value = NULL;
}
const char *strbuffer_value(strbuffer_t *strbuff)
}
const char *strbuffer_value(strbuffer_t *strbuff)
int strbuffer_append_bytes(strbuffer_t *strbuff, const char *data, int size)
{
int strbuffer_append_bytes(strbuffer_t *strbuff, const char *data, int size)
{
- if(strbuff->length + size > strbuff->size)
+ if(strbuff->length + size >= strbuff->size)
- if(strbuff->length == 0)
- strbuff->size = max(size + 1, STRBUFFER_MIN_SIZE);
- else
- strbuff->size = max(strbuff->size * STRBUFFER_FACTOR,
- strbuff->length + size + 1);
+ strbuff->size = max(strbuff->size * STRBUFFER_FACTOR,
+ strbuff->length + size + 1);
strbuff->value = realloc(strbuff->value, strbuff->size);
if(!strbuff->value)
strbuff->value = realloc(strbuff->value, strbuff->size);
if(!strbuff->value)
-void strbuffer_init(strbuffer_t *strbuff);
+int strbuffer_init(strbuffer_t *strbuff);
void strbuffer_close(strbuffer_t *strbuff);
const char *strbuffer_value(strbuffer_t *strbuff);
void strbuffer_close(strbuffer_t *strbuff);
const char *strbuffer_value(strbuffer_t *strbuff);