Changeset 192 for trunk

Timestamp:

09/03/07 21:47:42 (15 months ago)

Author:

zany

Message:

fixing cache root dups

Files:

• trunk/obexftp/cache.c (modified) (3 diffs)

trunk/obexftp/cache.c

@@ -62 +62 @@
         char *copy, *p;
 
-        return_val_if_fail(name != NULL, strdup(""));
+        if (!name) name = "";
 
         p = copy = malloc(strlen(name) + 2); /* at most add two slashes */
@@ -445 +445 @@
         for (cache = cli->cache; cache && strcmp(cache->name, abs); cache = cache->next);
         free(abs);
-        if (!cache)
-                return NULL;
+        if (!cache) {
+                free(path);
+                return NULL;
+        }
         DEBUG(2, "%s() found '%s'\n", __func__, cache->name);
                  
@@ -453 +455 @@
                 cache->stats = parse_directory(cache->content);
         DEBUG(2, "%s() got dir '%s'\n", __func__, path);
-        free(path);
         
         /* then lookup the basename */
         for (entry = cache->stats; entry && *entry->name && strcmp(entry->name, basename); entry++);
+        free(path);
         if (!entry || !(*entry->name))
                 return NULL;