Embedded/sc
1
0
Fork 0
mirror of https://github.com/tezc/sc.git synced 2025-02-04 07:13:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

sc_uri: use snprintf instead of sprintf (#106)

Browse Source
This commit is contained in:
Ozan Tezcan 2023-03-08 13:59:11 +03:00 committed by GitHub
parent 2aabcc422f
commit 86a1574b79
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
uri/sc_uri.c
View File

@ -158,9 +158,10 @@ struct sc_uri *sc_uri_create(const char *str)
fragment_len -= diff; // Skip "#" fragment_len -= diff; // Skip "#"
fragment += diff; // Skip "#" fragment += diff; // Skip "#"
ret = sprintf(dest, s2, scheme_len, scheme, 0, userinfo_len, userinfo, ret = snprintf(dest, parts_len, s2, scheme_len, scheme, 0,
0, host_len, host, 0, port_len, port, 0, path_len, path, userinfo_len, userinfo, 0, host_len, host, 0, port_len,
0, query_len, query, 0, fragment_len, fragment, 0); port, 0, path_len, path, 0, query_len, query, 0,
fragment_len, fragment, 0);
if (ret < 0 || (size_t) ret != parts_len - 1) { if (ret < 0 || (size_t) ret != parts_len - 1) {
goto error; goto error;
} }

25
uri/uri_test.c
View File

@ -300,23 +300,6 @@ int __wrap_snprintf(char *str, size_t size, const char *format, ...)
return fail_snprintf; return fail_snprintf;
} }
int fail_sprintf;
int __wrap_sprintf(char *str, const char *format, ...)
{
int rc;
va_list va;
if (!fail_sprintf) {
va_start(va, format);
rc = vsprintf(str, format, va);
va_end(va);
return rc;
}
return fail_sprintf;
}
void fail_test(void) void fail_test(void)
{ {
struct sc_uri *uri; struct sc_uri *uri;
@ -342,13 +325,13 @@ void fail_test(void)
assert(sc_uri_create("tcp://127.0.0.1") == NULL); assert(sc_uri_create("tcp://127.0.0.1") == NULL);
fail_snprintf = 0; fail_snprintf = 0;
fail_sprintf = -1; fail_snprintf = -1;
assert(sc_uri_create("tcp://127.0.0.1") == NULL); assert(sc_uri_create("tcp://127.0.0.1") == NULL);
fail_sprintf = 0; fail_snprintf = 0;
fail_sprintf = 1000000; fail_snprintf = 1000000;
assert(sc_uri_create("tcp://127.0.0.1") == NULL); assert(sc_uri_create("tcp://127.0.0.1") == NULL);
fail_sprintf = 0; fail_snprintf = 0;
fail_strtoul = 1; fail_strtoul = 1;
assert(sc_uri_create("tcp://127.0.0.1:9000") == NULL); assert(sc_uri_create("tcp://127.0.0.1:9000") == NULL);