Changeset 251d4dd in mainline

Timestamp:

2014-08-03T15:43:29Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

f2f4c00

Parents:

c2844735

Message:

Fix crash when cdfs is cleaning its node cache.

Location:

uspace

Files:

• lib/c/generic/adt/hash_table.c (modified) (1 diff)
• srv/fs/cdfs/cdfs_ops.c (modified) (1 diff)

uspace/lib/c/generic/adt/hash_table.c

@@ -370 +370 @@
                          */
                         if (!f(cur_link, arg))
-                                return;
-                }
-        }
-        
+                                goto out;
+                }
+        }
+out:
         h->apply_ongoing = false;
         

uspace/srv/fs/cdfs/cdfs_ops.c

@@ -249 +249 @@
         cdfs_node_t *node = hash_table_get_inst(item, cdfs_node_t, nh_link);
         
-        assert(node->type == CDFS_DIRECTORY);
-        
-        link_t *link;
-        while ((link = list_first(&node->cs_list)) != NULL) {
-                cdfs_dentry_t *dentry = list_get_instance(link, cdfs_dentry_t, link);
-                list_remove(&dentry->link);
-                free(dentry);
+        if (node->type == CDFS_DIRECTORY) {
+                link_t *link;
+                while ((link = list_first(&node->cs_list)) != NULL) {
+                        cdfs_dentry_t *dentry = list_get_instance(link, cdfs_dentry_t, link);
+                        list_remove(&dentry->link);
+                        free(dentry);
+                }
         }