RfidResearchGroup/proxmark3
1
1
Fork 0
mirror of https://github.com/RfidResearchGroup/proxmark3.git synced 2025-03-22 05:00:29 +08:00
Code Issues Projects Releases Packages Wiki Activity

FIX: remove overwriting warning

Browse source
This commit is contained in:
iceman1001 2019-01-08 02:23:06 +01:00
parent 2d5d8c130d
commit 699a3b7152
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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