sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

util: Fix off-by-one error in message about overflow

Browse Source 
len includes space for the NUL character, so the calculation needs to
take the NUL character into account.

While touching this, drop unnecessary casts by updating format string
and update to modern debug macro.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Andrew Bartlett <abartlet@samba.org>

Autobuild-User(master): Andrew Bartlett <abartlet@samba.org>
Autobuild-Date(master): Fri Jul  5 02:24:52 UTC 2019 on sn-devel-184
This commit is contained in:
Martin Schwenke 2019-07-01 21:42:56 +10:00 committed by Andrew Bartlett
parent 5f7d82a889
commit 9d90ac352d
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/util/substitute.c
View File

@ -66,10 +66,11 @@ static void string_sub2(char *s,const char *pattern, const char *insert, size_t
while (lp <= ls && (p = strstr_m(s,pattern))) {
if (ls + li - lp >= len) {
DEBUG(0,("ERROR: string overflow by "
"%d in string_sub(%.50s, %d)\n",
(int)(ls + li - lp - len),
pattern, (int)len));
DBG_ERR("ERROR: string overflow by "
"%zu in string_sub(%.50s, %zu)\n",
ls + li - lp + 1 - len,
pattern,
len);
break;
}
if (li != lp) {
@ -193,10 +194,11 @@ _PUBLIC_ void all_string_sub(char *s,const char *pattern,const char *insert, siz
while (lp <= ls && (p = strstr_m(s,pattern))) {
if (ls + li - lp >= len) {
DEBUG(0,("ERROR: string overflow by "
"%d in all_string_sub(%.50s, %d)\n",
(int)(ls + li - lp - len),
pattern, (int)len));
DBG_ERR("ERROR: string overflow by "
"%zu in all_string_sub(%.50s, %zu)\n",
ls + li - lp + 1 - len,
pattern,
len);
break;
}
if (li != lp) {