sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-12-12 12:23:50 +03:00
Code Activity

Fix for problem with "" string in trim_string(). Pointed out by Ben Winslow <rain@bluecherry.net>.

Browse Source 
Jeremy.
This commit is contained in:
Jeremy Allison
-
parent 95dfc4a60a
commit df2e306171
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source/lib/util_str.c
View File

@@ -545,9 +545,11 @@ BOOL trim_string(char *s,const char *front,const char *back)
size_t back_len; size_t back_len;
char *sP; char *sP;
if ( !s ) { /* Ignore null or empty strings. */
if ( !s || (s[0] == '\0'))
return False; return False;
}
sP = s; sP = s;
s_len = strlen( s ) + 1; s_len = strlen( s ) + 1;
front_len = (front) ? strlen( front ) + 1 : 0; front_len = (front) ? strlen( front ) + 1 : 0;
@@ -589,7 +591,7 @@ BOOL trim_string(char *s,const char *front,const char *back)
* Kenichi Okuyama. * Kenichi Okuyama.
*/ */
if ( back && back_len > 1 ) { if ( back && back_len > 1 && s_len > back_len) {
char *bP = sP + s_len - back_len; char *bP = sP + s_len - back_len;
long b_len = s_len; long b_len = s_len;