sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-07-31 20:22:15 +03:00
Code Activity

Finally remove all malloc()'s from the substitute code. Now totally

Browse Source 
talloc() based.

Autobuild-User: Jeremy Allison <jra@samba.org>
Autobuild-Date: Fri Jan 27 03:43:21 CET 2012 on sn-devel-104
This commit is contained in:
Jeremy Allison
2012-01-26 17:10:44 -08:00
parent 17a77ea9b4
commit a9e03337c1
4 changed files with 64 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source3/lib/substitute_generic.c
View File

@ -51,7 +51,7 @@ char *realloc_string_sub2(char *string,
s = string;
in = SMB_STRDUP(insert);
in = talloc_strdup(talloc_tos(), insert);
if (!in) {
DEBUG(0, ("realloc_string_sub: out of memory!\n"));
return NULL;
@ -88,11 +88,11 @@ char *realloc_string_sub2(char *string,
while ((p = strstr_m(s,pattern))) {
if (ld > 0) {
int offset = PTR_DIFF(s,string);
string = (char *)SMB_REALLOC(string, ls + ld + 1);
string = talloc_realloc(NULL, string, char, ls + ld + 1);
if (!string) {
DEBUG(0, ("realloc_string_sub: "
"out of memory!\n"));
SAFE_FREE(in);
talloc_free(in);
return NULL;
}
p = string + offset + (p - s);
@ -104,7 +104,7 @@ char *realloc_string_sub2(char *string,
s = p + li;
ls += ld;
}
SAFE_FREE(in);
talloc_free(in);
return string;
}