95dd927857
This is both good practice and nice for OpenBSD users, who will no longer get the nag message to not use sprintf/strcpy every time they link against jansson. It's worth noting that the existing code seems safe to me - bounds checks were already happening before the actual calls - and that this is for extra security.
64 lines
1.5 KiB
C
64 lines
1.5 KiB
C
#include <string.h>
|
|
#include "jansson_private.h"
|
|
|
|
void jsonp_error_init(json_error_t *error, const char *source)
|
|
{
|
|
if(error)
|
|
{
|
|
error->text[0] = '\0';
|
|
error->line = -1;
|
|
error->column = -1;
|
|
error->position = 0;
|
|
if(source)
|
|
jsonp_error_set_source(error, source);
|
|
else
|
|
error->source[0] = '\0';
|
|
}
|
|
}
|
|
|
|
void jsonp_error_set_source(json_error_t *error, const char *source)
|
|
{
|
|
size_t length;
|
|
|
|
if(!error || !source)
|
|
return;
|
|
|
|
length = strlen(source);
|
|
if(length < JSON_ERROR_SOURCE_LENGTH)
|
|
strncpy(error->source, source, length + 1);
|
|
else {
|
|
size_t extra = length - JSON_ERROR_SOURCE_LENGTH + 4;
|
|
strncpy(error->source, "...", 3);
|
|
strncpy(error->source + 3, source + extra, length - extra + 1);
|
|
}
|
|
}
|
|
|
|
void jsonp_error_set(json_error_t *error, int line, int column,
|
|
size_t position, const char *msg, ...)
|
|
{
|
|
va_list ap;
|
|
|
|
va_start(ap, msg);
|
|
jsonp_error_vset(error, line, column, position, msg, ap);
|
|
va_end(ap);
|
|
}
|
|
|
|
void jsonp_error_vset(json_error_t *error, int line, int column,
|
|
size_t position, const char *msg, va_list ap)
|
|
{
|
|
if(!error)
|
|
return;
|
|
|
|
if(error->text[0] != '\0') {
|
|
/* error already set */
|
|
return;
|
|
}
|
|
|
|
error->line = line;
|
|
error->column = column;
|
|
error->position = (int)position;
|
|
|
|
vsnprintf(error->text, JSON_ERROR_TEXT_LENGTH, msg, ap);
|
|
error->text[JSON_ERROR_TEXT_LENGTH - 1] = '\0';
|
|
}
|