Changeset db8a034 in mainline

Timestamp:

2011-12-09T12:38:13Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

a2bd204f, c8c43cae

Parents:

c40f385 (diff), 04aaed8f (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge from lp:exfat-helenos.

File:

• uspace/srv/fs/exfat/exfat_directory.c (modified) (4 diffs)

uspace/srv/fs/exfat/exfat_directory.c

@@ -92 +92 @@
         int rc = EOK;
         
-        if (di->b)
+        if (di->b) {
                 rc = block_put(di->b);
+                di->b = NULL;
+        }
         
         return rc;
@@ -285 +287 @@
         for (i = 0; i < count; i++) {
                 rc = exfat_directory_get(di, &de);
-                if (rc != EOK)
-                        return rc;
+                if (rc != EOK) {
+                        free(array);
+                        return rc;
+                }
                 array[i] = *de;
                 rc = exfat_directory_next(di);
@@ -312 +316 @@
         for (i = 0; i < count; i++) {
                 rc = exfat_directory_get(di, &de);
-                if (rc != EOK)
-                        return rc;
+                if (rc != EOK) {
+                        free(array);
+                        return rc;
+                }
                 *de = array[i];
                 di->b->dirty = true;
@@ -424 +430 @@
 
                 di->b->dirty = true;
-                sname += chars;
         }