diff options
| author | Jeremy Allison <jra@samba.org> | 2012-08-08 17:01:00 -0700 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2012-08-09 12:08:18 -0700 |
| commit | b70f23c2b581c5d455362ab37f4846de9a910055 (patch) | |
| tree | cf95e8d35a03d1e39d5926d2e03d7046d42cae64 /source3/lib/util_str.c | |
| parent | ce21d0804012da27cec72abe896352d7f0e7e1e5 (diff) | |
| download | samba-b70f23c2b581c5d455362ab37f4846de9a910055.tar.gz samba-b70f23c2b581c5d455362ab37f4846de9a910055.tar.bz2 samba-b70f23c2b581c5d455362ab37f4846de9a910055.zip | |
Correctly check for errors in strlower_m() returns.
Diffstat (limited to 'source3/lib/util_str.c')
| -rw-r--r-- | source3/lib/util_str.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/source3/lib/util_str.c b/source3/lib/util_str.c index 8962b23da0..c302851335 100644 --- a/source3/lib/util_str.c +++ b/source3/lib/util_str.c @@ -60,8 +60,7 @@ bool strnorm(char *s, int case_default) if (case_default == CASE_UPPER) return strupper_m(s); else - strlower_m(s); - return true; /* FIXME - return strlower_m value later. */ + return strlower_m(s); } /** @@ -491,7 +490,6 @@ bool strlower_m(char *s) /* Catch mb conversion errors that may not terminate. */ if (errno) { s[len-1] = '\0'; - ret = false; } errno = errno_save; return ret; @@ -1033,7 +1031,10 @@ char *talloc_asprintf_strlower_m(TALLOC_CTX *t, const char *fmt, ...) if (ret == NULL) { return NULL; } - strlower_m(ret); + if (!strlower_m(ret)) { + TALLOC_FREE(ret); + return NULL; + } return ret; } |