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

s3:lib Use push_ucs2_talloc() in ms_fnmatch()

Browse Source 
Signed-off-by: Günther Deschner <gd@samba.org>
This commit is contained in:
Andrew Bartlett 2009-03-18 18:05:17 +11:00 committed by Günther Deschner
parent c5b24d65cd
commit 6859b805e8
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
source3/lib/ms_fnmatch.c
View File

@ -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;
}