Changeset 204 for branches/samba-3.2.x/source/lib/util_str.c

Timestamp:

May 20, 2009, 6:46:53 PM (16 years ago)

Author:

Herwig Bauernfeind

Message:

Update 3.2 branch to 3.2.4

File:

• branches/samba-3.2.x/source/lib/util_str.c (modified) (3 diffs)

branches/samba-3.2.x/source/lib/util_str.c

@@ -2007 +2007 @@
 bool str_list_substitute(char **list, const char *pattern, const char *insert)
 {
+        TALLOC_CTX *ctx = list;
         char *p, *s, *t;
         ssize_t ls, lp, li, ld, i, d;
@@ -2029 +2030 @@
                         d = p -t;
                         if (ld) {
-                                t = (char *) SMB_MALLOC(ls +ld +1);
+                                t = TALLOC_ARRAY(ctx, char, ls +ld +1);
                                 if (!t) {
                                         DEBUG(0,("str_list_substitute: "
@@ -2037 +2038 @@
                                 memcpy(t, *list, d);
                                 memcpy(t +d +li, p +lp, ls -d -lp +1);
-                                SAFE_FREE(*list);
+                                TALLOC_FREE(*list);
                                 *list = t;
                                 ls += ld;