Itms/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

bullet-proofing - fail if reloading VDir

Browse Source 
This was SVN commit r531.
This commit is contained in:
janwas 2004-06-18 13:32:33 +00:00
parent 3c6becec37
commit 941f7c3661
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source/lib/res/vfs.cpp
View File

@ -887,12 +887,17 @@ static void VDir_dtor(VDir* vd)
static int VDir_reload(VDir* vd, const char* path)
{
// check if actually reloaded, and why it happened?
if(vd->subdirs)
{
debug_warn("VDir_reload called when already loaded - why?");
return 0;
}
Dir* dir;
CHECK_ERR(tree_lookup(path, 0, &dir));
// rationale for copy: see VDir definition
// rationale for copying the dir's data: see VDir definition
// note: bad_alloc exception handled by h_alloc.
vd->subdirs = new SubDirs(dir->subdirs);
vd->subdir_it = vd->subdirs->begin();
vd->files = new Files(dir->files);