Changeset 8e77b12f in mainline

Timestamp:

2014-08-04T17:35:40Z (10 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d4b63fa

Parents:

f2f4c00

Message:

Skip special CDFS directory entries. Correctly detect the last one.

File:

• uspace/srv/fs/cdfs/cdfs_ops.c (modified) (3 diffs)

uspace/srv/fs/cdfs/cdfs_ops.c

@@ -66 +66 @@
 #define CDFS_STANDARD_IDENT  "CD001"
 
+enum {
+        CDFS_NAME_CURDIR = '\x00',
+        CDFS_NAME_PARENTDIR = '\x01'
+};
+
 typedef enum {
         VOL_DESC_BOOT = 0,
@@ -409 +414 @@
                         return false;
                 
-                cdfs_dir_t *dir = (cdfs_dir_t *) block->data;
+                cdfs_dir_t *dir;
                 
-                // FIXME: skip '.' and '..'
-                
-                for (size_t offset = 0;
-                    (dir->length != 0) && (offset < BLOCK_SIZE);
+                for (size_t offset = 0; offset < BLOCK_SIZE;
                     offset += dir->length) {
                         dir = (cdfs_dir_t *) (block->data + offset);
+                        if (dir->length == 0)
+                                break;
+                        if (offset + dir->length > BLOCK_SIZE) {
+                                /* XXX Incorrect FS structure */
+                                break;
+                        }
                         
                         cdfs_dentry_type_t dentry_type;
@@ -423 +431 @@
                         else
                                 dentry_type = CDFS_FILE;
+                        
+                        /* Skip special entries */
+                        
+                        if (dir->name_length == 1 &&
+                            dir->name[0] == CDFS_NAME_CURDIR)
+                                continue;
+                        if (dir->name_length == 1 &&
+                            dir->name[0] == CDFS_NAME_PARENTDIR)
+                                continue;
                         
                         // FIXME: hack - indexing by dentry byte offset on disc