diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2009-03-18 18:05:17 +1100 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2009-04-08 01:15:24 +0200 |
| commit | 6859b805e84af91eca641ec1b91b844cbdab4065 (patch) | |
| tree | b6fc49ef5d05cb5246634c39b77c6aaf59b158db /source3/lib/ms_fnmatch.c | |
| parent | c5b24d65cdb1b32196681499dcaf23ea70e1019b (diff) | |
| download | samba-6859b805e84af91eca641ec1b91b844cbdab4065.tar.gz samba-6859b805e84af91eca641ec1b91b844cbdab4065.tar.bz2 samba-6859b805e84af91eca641ec1b91b844cbdab4065.zip | |
s3:lib Use push_ucs2_talloc() in ms_fnmatch()
Signed-off-by: Günther Deschner <gd@samba.org>
Diffstat (limited to 'source3/lib/ms_fnmatch.c')
| -rw-r--r-- | source3/lib/ms_fnmatch.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/source3/lib/ms_fnmatch.c b/source3/lib/ms_fnmatch.c index ca534467fa..1eac9fa14a 100644 --- a/source3/lib/ms_fnmatch.c +++ b/source3/lib/ms_fnmatch.c @@ -170,12 +170,12 @@ int ms_fnmatch(const char *pattern, const char *string, bool translate_pattern, } } - if (!push_ucs2_allocate(&p, pattern, &converted_size)) { + if (!push_ucs2_talloc(talloc_tos(), &p, pattern, &converted_size)) { return -1; } - if (!push_ucs2_allocate(&s, string, &converted_size)) { - SAFE_FREE(p); + if (!push_ucs2_talloc(talloc_tos(), &s, string, &converted_size)) { + TALLOC_FREE(p); return -1; } @@ -214,8 +214,8 @@ int ms_fnmatch(const char *pattern, const char *string, bool translate_pattern, else { max_n = SMB_CALLOC_ARRAY(struct max_n, count); if (!max_n) { - SAFE_FREE(p); - SAFE_FREE(s); + TALLOC_FREE(p); + TALLOC_FREE(s); return -1; } max_n_free = max_n; @@ -225,8 +225,8 @@ int ms_fnmatch(const char *pattern, const char *string, bool translate_pattern, ret = ms_fnmatch_core(p, s, max_n, strrchr_w(s, UCS2_CHAR('.')), is_case_sensitive); SAFE_FREE(max_n_free); - SAFE_FREE(p); - SAFE_FREE(s); + TALLOC_FREE(p); + TALLOC_FREE(s); return ret; } |