projects
/
collectd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
iptables plugin: Initialize ip_version.
[collectd.git]
/
src
/
utils_subst.c
diff --git
a/src/utils_subst.c
b/src/utils_subst.c
index
3c9fe5a
..
a49f6db
100644
(file)
--- a/
src/utils_subst.c
+++ b/
src/utils_subst.c
@@
-37,7
+37,8
@@
char *subst (char *buf, size_t buflen, const char *string, int off1, int off2,
|| (NULL == replacement))
return NULL;
|| (NULL == replacement))
return NULL;
- sstrncpy (buf_ptr, string, (off1 + 1 > buflen) ? buflen : off1 + 1);
+ sstrncpy (buf_ptr, string,
+ ((size_t)off1 + 1 > buflen) ? buflen : (size_t)off1 + 1);
buf_ptr += off1;
len -= off1;
buf_ptr += off1;
len -= off1;
@@
-128,7
+129,7
@@
char *subst_string (char *buf, size_t buflen, const char *string,
strncpy (buf, temp, buflen);
}
strncpy (buf, temp, buflen);
}
- if (i >=
100
)
+ if (i >=
buflen
)
{
WARNING ("subst_string: Loop exited after %zu iterations: "
"string = %s; needle = %s; replacement = %s;",
{
WARNING ("subst_string: Loop exited after %zu iterations: "
"string = %s; needle = %s; replacement = %s;",