Changeset 30186 in vbox for trunk

Timestamp:

Jun 14, 2010 8:54:19 PM (15 years ago)

Author:

vboxsync

Message:

Linux shared folders: fixed a small memory leak when reading the content of a directory

Location:

trunk/src/VBox/Additions/linux/sharedfolders

Files:

• dirops.c (modified) (1 diff)
• utils.c (modified) (4 diffs)

trunk/src/VBox/Additions/linux/sharedfolders/dirops.c

@@ -632 +632 @@
     /* directory content changed */
     sf_i->force_reread = 1;
-    kfree(path);
-    return 0;
+
+    err = 0;
 
 fail1:

trunk/src/VBox/Additions/linux/sharedfolders/utils.c

@@ -387 +387 @@
     uint8_t *p_name;
     uint8_t *dst;
-    int is_root = 0;
+    int fRoot = 0;
 
     TRACE();
@@ -396 +396 @@
     {
         path_len = d_len + 1;
-        is_root = 1;
+        fRoot = 1;
     }
     else
@@ -419 +419 @@
     tmp->u16Size = path_len;
 
-    if (is_root)
-        memcpy(tmp->String.utf8, d_name, d_len + 1);
+    if (fRoot)
+        memcpy(&tmp->String.utf8[0], d_name, d_len + 1);
     else
     {
-        dst = tmp->String.utf8;
-        memcpy(dst, p_name, p_len);
-        dst += p_len; *dst++ = '/';
-        memcpy(dst, d_name, d_len);
-        dst[d_len] = 0;
+        memcpy(&tmp->String.utf8[0], p_name, p_len);
+        tmp->String.utf8[p_len] = '/';
+        memcpy(&tmp->String[plen + 1], d_name, d_len);
+        tmp->String.utf8[p_len + 1 + d_len] = '\0';
     }
 
@@ -774 +773 @@
             break;
     }
-    return 0;
+    err = 0;
 
 fail1: