FGCOM/jansson
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #233 from haldean/master

Browse Source 
Use snprintf and strncpy in place of sprintf and strcpy

OpenBSD linker nags about using sprintf and strcpy.
This commit is contained in:
Petri Lehtinen 2015-04-30 10:43:39 +03:00
commit d8753db4ac
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/dump.c
View File

@ -130,7 +130,7 @@ static int dump_string(const char *str, size_t len, json_dump_callback_t dump, v
/* codepoint is in BMP */ /* codepoint is in BMP */
if(codepoint < 0x10000) if(codepoint < 0x10000)
{ {
sprintf(seq, "\\u%04X", codepoint); snprintf(seq, 13, "\\u%04X", codepoint);
length = 6; length = 6;
} }
@ -143,7 +143,7 @@ static int dump_string(const char *str, size_t len, json_dump_callback_t dump, v
first = 0xD800 | ((codepoint & 0xffc00) >> 10); first = 0xD800 | ((codepoint & 0xffc00) >> 10);
last = 0xDC00 | (codepoint & 0x003ff); last = 0xDC00 | (codepoint & 0x003ff);
sprintf(seq, "\\u%04X\\u%04X", first, last); snprintf(seq, 13, "\\u%04X\\u%04X", first, last);
length = 12; length = 12;
} }

6
src/error.c
View File

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

2
src/hashtable.c
View File

@ -251,7 +251,7 @@ int hashtable_set(hashtable_t *hashtable,
pair->hash = hash; pair->hash = hash;
pair->serial = serial; pair->serial = serial;
strcpy(pair->key, key); strncpy(pair->key, key, len + 1);
pair->value = value; pair->value = value;
list_init(&pair->list); list_init(&pair->list);