чување f67259ce7aa9d7a67fe5e00c245b99123539e9fe
родитељ 8818957a9cc7358e79ce38d9562e8505185a1fb1
Аутор: Страхиња Радић <contact@strahinja.org>
Датум: Sat, 2 Mar 2024 21:19:25 +0100
Use >= instead of > in strlcpy tests
Signed-off-by: Страхиња Радић <contact@strahinja.org>
Diffstat:
| M | slweb.c | | | 62 | +++++++++++++++++++++++++++++++------------------------------- |
измењених датотека: 1, додавања: 31(+), брисања: 31(-)
diff --git a/slweb.c b/slweb.c
@@ -273,7 +273,7 @@ set_basedir(char** basedir, size_t* basedir_size, const char* arg)
REALLOC(*basedir, char, *basedir_size);
}
- if (strlcpy(*basedir, arg, *basedir_size) > *basedir_size)
+ if (strlcpy(*basedir, arg, *basedir_size) >= *basedir_size)
warning(1, (u8*)"strlcpy:%d: Overflow", __LINE__);
basedir_len = strlen(*basedir);
if (*(*basedir + basedir_len - 1) == '/')
@@ -297,7 +297,7 @@ set_global_link_prefix(char** global_link_prefix,
REALLOC(*global_link_prefix, char, *global_link_prefix_size);
}
if (strlcpy(*global_link_prefix, arg, *global_link_prefix_size)
- > *global_link_prefix_size)
+ >= *global_link_prefix_size)
warning(1, (u8*)"strlcpy:%d: Overflow", __LINE__);
*(*global_link_prefix + arg_len) = 0;
@@ -358,7 +358,7 @@ print_output(FILE* output, const char* fmt, ...)
csv_template_size = BUFSIZE;
CALLOC(csv_template, u8, csv_template_size);
if (strlcpy((char*)csv_template, buf, csv_template_size)
- > csv_template_size)
+ >= csv_template_size)
warning(1, (u8*)"strlcpy:%d: Overflow",
__LINE__);
}
@@ -386,7 +386,7 @@ print_output(FILE* output, const char* fmt, ...)
tsv_template_size = BUFSIZE;
CALLOC(tsv_template, u8, tsv_template_size);
if (strlcpy((char*)tsv_template, buf, tsv_template_size)
- > tsv_template_size)
+ >= tsv_template_size)
warning(1, (u8*)"strlcpy:%d: Overflow",
__LINE__);
}
@@ -602,13 +602,13 @@ process_git_log(FILE* output)
if (slash)
{
- if (strlcpy(basename, slash + 1, basename_size) > basename_size)
+ if (strlcpy(basename, slash + 1, basename_size) >= basename_size)
warning(1, (u8*)"strlcpy:%d: Overflow", __LINE__);
}
else
{
if (strlcpy(basename, input_filename, basename_size)
- > basename_size)
+ >= basename_size)
warning(1, (u8*)"strlcpy:%d: Overflow", __LINE__);
}
@@ -902,7 +902,7 @@ read_tsv(FILE* output, const char* filename, tsv_callback_t callback)
if ((res = strlcpy((char*)tsv_register
[current_register],
(char*)token, BUFSIZE))
- > BUFSIZE)
+ >= BUFSIZE)
warning(1, (u8*)"strlcpy:%d: Overflow",
__LINE__);
current_register++;
@@ -912,7 +912,7 @@ read_tsv(FILE* output, const char* filename, tsv_callback_t callback)
{
if (strlcpy((char*)tsv_header[current_header],
(char*)token, BUFSIZE)
- > BUFSIZE)
+ >= BUFSIZE)
warning(1, (u8*)"strlcpy:%d: Overflow",
__LINE__);
current_header++;
@@ -932,7 +932,7 @@ read_tsv(FILE* output, const char* filename, tsv_callback_t callback)
{
if (strlcpy((char*)tsv_register[current_register],
(char*)token, BUFSIZE)
- > BUFSIZE)
+ >= BUFSIZE)
warning(1, (u8*)"strlcpy:%d: Overflow",
__LINE__);
current_register++;
@@ -944,7 +944,7 @@ read_tsv(FILE* output, const char* filename, tsv_callback_t callback)
{
if (strlcpy((char*)tsv_header[current_header],
(char*)token, BUFSIZE)
- > BUFSIZE)
+ >= BUFSIZE)
warning(1, (u8*)"strlcpy:%d: Overflow",
__LINE__);
current_header++;
@@ -1257,7 +1257,7 @@ read_csv(FILE* output, const char* filename, csv_callback_t callback)
if (strlcpy((char*)csv_register
[current_register],
(char*)token, BUFSIZE)
- > BUFSIZE)
+ >= BUFSIZE)
warning(1, (u8*)"strlcpy:%d: Overflow",
__LINE__);
current_register++;
@@ -1268,7 +1268,7 @@ read_csv(FILE* output, const char* filename, csv_callback_t callback)
if (strlcpy((char*)csv_header
[current_header],
(char*)token, BUFSIZE)
- > BUFSIZE)
+ >= BUFSIZE)
warning(1, (u8*)"strlcpy:%d: Overflow",
__LINE__);
current_header++;
@@ -1289,7 +1289,7 @@ read_csv(FILE* output, const char* filename, csv_callback_t callback)
if (strlcpy((char*)csv_register
[current_register],
(char*)token, BUFSIZE)
- > BUFSIZE)
+ >= BUFSIZE)
warning(1, (u8*)"strlcpy:%d: Overflow",
__LINE__);
current_register++;
@@ -1300,7 +1300,7 @@ read_csv(FILE* output, const char* filename, csv_callback_t callback)
if (strlcpy((char*)csv_header
[current_header],
(char*)token, BUFSIZE)
- > BUFSIZE)
+ >= BUFSIZE)
warning(1, (u8*)"strlcpy:%d: Overflow",
__LINE__);
current_header++;
@@ -1320,7 +1320,7 @@ read_csv(FILE* output, const char* filename, csv_callback_t callback)
{
if (strlcpy((char*)csv_register[current_register],
(char*)token, BUFSIZE)
- > BUFSIZE)
+ >= BUFSIZE)
warning(1, (u8*)"strlcpy:%d: Overflow",
__LINE__);
current_register++;
@@ -1332,7 +1332,7 @@ read_csv(FILE* output, const char* filename, csv_callback_t callback)
{
if (strlcpy((char*)csv_header[current_header],
(char*)token, BUFSIZE)
- > BUFSIZE)
+ >= BUFSIZE)
warning(1, (u8*)"strlcpy:%d: Overflow",
__LINE__);
current_header++;
@@ -2124,7 +2124,7 @@ process_macro_def(FILE* output, const u8* token,
}
CALLOC(pmacros->key, u8, KEYSIZE);
if (strlcpy((char*)pmacros->key, (char*)token + 2, KEYSIZE)
- > KEYSIZE)
+ >= KEYSIZE)
warning(1, (u8*)"strlcpy:%d: Overflow", __LINE__);
pmacros->value = NULL;
pmacros->value_size = 0;
@@ -2604,7 +2604,7 @@ process_inline_footnote(const u8* token, const int read_yaml_macros_and_links,
if (strlcpy((char*)inline_footnotes[inline_footnote_count - 1],
(char*)token, token_len + 1)
- > token_len + 1)
+ >= token_len + 1)
warning(1, (u8*)"strlcpy:%d: Overflow", __LINE__);
*(inline_footnotes[inline_footnote_count - 1] + token_len) = 0;
}
@@ -2646,7 +2646,7 @@ process_footnote(FILE* output, const u8* token, const int footnote_definition,
}
CALLOC(pfootnotes->key, u8, KEYSIZE);
if (strlcpy((char*)pfootnotes->key, (char*)token, KEYSIZE)
- > KEYSIZE)
+ >= KEYSIZE)
warning(1, (u8*)"strlcpy:%d: Overflow", __LINE__);
pfootnotes->value = NULL;
pfootnotes->value_size = 0;
@@ -2990,14 +2990,14 @@ simple_parse_yaml_line(const u8* line, KeyValue** vars, size_t* vars_count,
CALLOC((*pvars)->key, u8, KEYSIZE);
if (strlcpy((char*)(*pvars)->key, (char*)var_key,
KEYSIZE)
- > KEYSIZE)
+ >= KEYSIZE)
warning(1, (u8*)"strlcpy:%d: Overflow",
__LINE__);
(*pvars)->value_size = strlen((char*)token) + 1;
CALLOC((*pvars)->value, u8, (*pvars)->value_size);
if (strlcpy((char*)(*pvars)->value, (char*)token,
(*pvars)->value_size)
- > (*pvars)->value_size)
+ >= (*pvars)->value_size)
warning(1, (u8*)"strlcpy:%d: Overflow",
__LINE__);
}
@@ -3249,7 +3249,7 @@ do_line:
}
CALLOC(pvars->key, u8, KEYSIZE);
if (strlcpy((char*)pvars->key, (char*)token, KEYSIZE)
- > KEYSIZE)
+ >= KEYSIZE)
warning(1, (u8*)"strlcpy:%d: Overflow",
__LINE__);
pvars->value = NULL;
@@ -3937,7 +3937,7 @@ do_line:
{
*ptoken = 0;
if (strlcpy((char*)link_macro, (char*)token, BUFSIZE)
- > BUFSIZE)
+ >= BUFSIZE)
warning(1, (u8*)"strlcpy:%d: Overflow",
__LINE__);
*(link_macro + strlen((char*)token)) = 0;
@@ -4002,7 +4002,7 @@ do_line:
if (strlcpy((char*)pmacros->value,
(char*)token,
pmacros->value_size)
- > pmacros->value_size)
+ >= pmacros->value_size)
warning(1, (u8*)"strlcpy:%d: Overflow",
__LINE__);
}
@@ -4814,7 +4814,7 @@ do_line:
CALLOC(plinks->key, u8, KEYSIZE);
if (strlcpy((char*)plinks->key, (char*)token,
KEYSIZE)
- > KEYSIZE)
+ >= KEYSIZE)
warning(1, (u8*)"strlcpy:%d: Overflow",
__LINE__);
plinks->value = NULL;
@@ -4847,7 +4847,7 @@ do_line:
}
if (strlcpy((char*)link_text, (char*)token,
link_size)
- > link_size)
+ >= link_size)
warning(1, (u8*)"strlcpy:%d: Overflow",
__LINE__);
*(link_text + token_len) = 0;
@@ -5138,7 +5138,7 @@ done_line:
pvars->value_size = strlen((char*)token) + 1;
CALLOC(pvars->value, u8, pvars->value_size);
if (strlcpy((char*)pvars->value, (char*)token, pvars->value_size)
- > pvars->value_size)
+ >= pvars->value_size)
warning(1, (u8*)"strlcpy:%d: Overflow", __LINE__);
}
else if (keep_token)
@@ -5207,7 +5207,7 @@ done_line:
if (strlcpy((char*)pmacros->value,
(char*)token,
pmacros->value_size)
- > pmacros->value_size)
+ >= pmacros->value_size)
warning(1, (u8*)"strlcpy:%d: Overflow",
__LINE__);
if (strlcat((char*)pmacros->value, "\n",
@@ -5263,7 +5263,7 @@ done_line:
if (strlcpy((char*)pfootnotes->value,
(char*)token,
pfootnotes->value_size)
- > pfootnotes->value_size)
+ >= pfootnotes->value_size)
warning(1, (u8*)"strlcpy:%d: Overflow",
__LINE__);
if (strlcat((char*)pfootnotes->value,
@@ -5296,7 +5296,7 @@ done_line:
if (strlcpy((char*)plinks->value,
(char*)token,
plinks->value_size)
- > plinks->value_size)
+ >= plinks->value_size)
warning(1, (u8*)"strlcpy:%d: Overflow",
__LINE__);
}
@@ -5403,7 +5403,7 @@ done_line:
if (strlcpy((char*)pfootnotes->value,
(char*)token,
pfootnotes->value_size)
- > pfootnotes->value_size)
+ >= pfootnotes->value_size)
warning(1, (u8*)"strlcpy:%d: Overflow",
__LINE__);
}
