Merge pull request #5183 from geky/fix-dir-open-failures

theotherjimmy · web-flow · commit 5a018585c689 · 2017-09-28T13:59:28.000-05:00
fs: Fix dir open during failure condition
diff --git a/features/filesystem/Dir.cpp b/features/filesystem/Dir.cpp
@@ -43,8 +43,12 @@ int Dir::open(FileSystem *fs, const char *path)
         return -EINVAL;
     }
 
-    _fs = fs;
-    return _fs->dir_open(&_dir, path);
+    int err = fs->dir_open(&_dir, path);
+    if (!err) {
+        _fs = fs;
+    }
+
+    return err;
 }
 
 int Dir::close()

Original file line number	Diff line number	Diff line change
`@@ -43,8 +43,12 @@ int Dir::open(FileSystem fs, const char path)`
`43`	`43`	`return -EINVAL;`
`44`	`44`	`}`
`45`	`45`
`46`		`- _fs = fs;`
`47`		`- return _fs->dir_open(&_dir, path);`
	`46`	`+ int err = fs->dir_open(&_dir, path);`
	`47`	`+ if (!err) {`
	`48`	`+ _fs = fs;`
	`49`	`+ }`
	`50`	`+`
	`51`	`+ return err;`
`48`	`52`	`}`
`49`	`53`
`50`	`54`	`int Dir::close()`