The branch, v3-4-test has been updated via e27c0d668bd93f7d64a2fe0c6aef6edc63af64d4 (commit) from 3db2ef0394a3fdb11c8a54777360cbcdb94c87da (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test - Log ----------------------------------------------------------------- commit e27c0d668bd93f7d64a2fe0c6aef6edc63af64d4 Author: Andrew Bartlett <abart...@samba.org> Date: Wed Mar 18 18:05:17 2009 +1100 s3:lib Use push_ucs2_talloc() in ms_fnmatch() Signed-off-by: Günther Deschner <g...@samba.org> (cherry picked from commit 6859b805e84af91eca641ec1b91b844cbdab4065) ----------------------------------------------------------------------- Summary of changes: source3/lib/ms_fnmatch.c | 14 +++++++------- 1 files changed, 7 insertions(+), 7 deletions(-) Changeset truncated at 500 lines: diff --git a/source3/lib/ms_fnmatch.c b/source3/lib/ms_fnmatch.c index ca53446..1eac9fa 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; } -- Samba Shared Repository