github/proxmark3
1
0
Fork 0
mirror of https://github.com/Proxmark/proxmark3.git synced 2025-07-07 05:31:17 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Jansson gcc8 fix (#679)

Browse source 
* Fix error in error.c
* Fix error in load.c
This commit is contained in:
Fl0-0 2018-09-22 17:51:13 +02:00 • committed by pwpiwi
parent 050aa18b13
commit a7e1b46d51
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
client/jansson/error.c
View file

@ -25,10 +25,10 @@ void jsonp_error_set_source(json_error_t *error, const char *source)
length = strlen(source);
if(length < JSON_ERROR_SOURCE_LENGTH)
strncpy(error->source, source, length + 1);
strncpy(error->source, source, JSON_ERROR_SOURCE_LENGTH);
else {
size_t extra = length - JSON_ERROR_SOURCE_LENGTH + 4;
strncpy(error->source, "...", 3);
memcpy(error->source, "...", 3);
strncpy(error->source + 3, source + extra, length - extra + 1);
}
}

6
client/jansson/load.c
View file

@ -89,7 +89,7 @@ static void error_set(json_error_t *error, const lex_t *lex,
{
va_list ap;
char msg_text[JSON_ERROR_TEXT_LENGTH];
char msg_with_context[JSON_ERROR_TEXT_LENGTH];
char msg_with_context[JSON_ERROR_TEXT_LENGTH + 28];
int line = -1, col = -1;
size_t pos = 0;
@ -114,7 +114,7 @@ static void error_set(json_error_t *error, const lex_t *lex,
if(saved_text && saved_text[0])
{
if(lex->saved_text.length <= 20) {
snprintf(msg_with_context, JSON_ERROR_TEXT_LENGTH,
snprintf(msg_with_context, JSON_ERROR_TEXT_LENGTH + 28,
"%s near '%s'", msg_text, saved_text);
msg_with_context[JSON_ERROR_TEXT_LENGTH - 1] = '\0';
result = msg_with_context;
@ -131,7 +131,7 @@ static void error_set(json_error_t *error, const lex_t *lex,
result = msg_text;
}
else {
snprintf(msg_with_context, JSON_ERROR_TEXT_LENGTH,
snprintf(msg_with_context, JSON_ERROR_TEXT_LENGTH + 17,
"%s near end of file", msg_text);
msg_with_context[JSON_ERROR_TEXT_LENGTH - 1] = '\0';
result = msg_with_context;