Changeset 740 for vendor/current/source4/libcli/clideltree.c

Timestamp:

Nov 14, 2012, 12:59:34 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: update vendor to 3.6.0

File:

• vendor/current/source4/libcli/clideltree.c (modified) (3 diffs)

vendor/current/source4/libcli/clideltree.c

@@ -42 +42 @@
         n = strdup(name);
         n[strlen(n)-1] = 0;
-        asprintf(&s, "%s%s", n, finfo->name);
+        if (asprintf(&s, "%s%s", n, finfo->name) < 0) {
+                free(n);
+                return;
+        }
 
         if (finfo->attrib & FILE_ATTRIBUTE_READONLY) {
@@ -53 +56 @@
         if (finfo->attrib & FILE_ATTRIBUTE_DIRECTORY) {
                 char *s2;
-                asprintf(&s2, "%s\\*", s);
+                if (asprintf(&s2, "%s\\*", s) < 0) {
+                        free(s);
+                        free(n);
+                        return;
+                }
                 smbcli_unlink(dstate->tree, s2);
                 smbcli_list(dstate->tree, s2, 
@@ -110 +117 @@
         }
 
-        asprintf(&mask, "%s\\*", dname);
+        if (asprintf(&mask, "%s\\*", dname) < 0) {
+                return -1;
+        }
         smbcli_unlink(dstate.tree, mask);
         smbcli_list(dstate.tree, mask,