Fix zipFiler crash on dirs with subdirs

This happens since nodes for directories don't have their "file" field initialized. Signed-off-by: Tal Einat <[email protected]>
src-d · May 2, 2020 · 3032061 · 3032061
1 parent 63bc934
commit 3032061
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/licensedb/filer/filer.go b/licensedb/filer/filer.go
@@ -323,9 +323,13 @@ func (filer *zipFiler) ReadDir(path string) ([]File, error) {
 	}
 	result := make([]File, 0, len(node.children))
 	for name, child := range node.children {
+	    isDir := true
+	    if child.file != nil {
+	        isDir = child.file.FileInfo().IsDir()
+	    }
 		result = append(result, File{
 			Name:  name,
-			IsDir: child.file.FileInfo().IsDir(),
+			IsDir: isDir,
 		})
 	}
 	return result, nil

diff --git a/licensedb/filer/test_data/empty_sub_dir.zip b/licensedb/filer/test_data/empty_sub_dir.zip