chenlin/Mujoco_WASM
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix infinite loop in mj_deleteFileVFS

Browse Source
This commit is contained in:
Kristian Hartikainen
2023-01-21 17:26:01 +00:00
parent d7844aa5be
commit 436fc6e77c
2 changed files with 32 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/engine/engine_vfs.c
+4 -4
View File
@@ -179,10 +179,10 @@ int mj_deleteFileVFS(mjVFS* vfs, const char* filename) {
mju_free(vfs->filedata[i]); mju_free(vfs->filedata[i]);
// scroll remaining files forward // scroll remaining files forward
while (i<vfs->nfile-1) { for (int j = i; j < vfs->nfile - 1; ++j) {
mjSTRNCPY(vfs->filename[i], vfs->filename[i+1]); mjSTRNCPY(vfs->filename[j], vfs->filename[j+1]);
vfs->filesize[i] = vfs->filesize[i+1]; vfs->filesize[j] = vfs->filesize[j+1];
vfs->filedata[i] = vfs->filedata[i+1]; vfs->filedata[j] = vfs->filedata[j+1];
} }
// set last to 0, for style // set last to 0, for style
test/engine/engine_vfs_test.cc
+28 -6
View File
@@ -29,17 +29,39 @@ using EngineVfsTest = MujocoTest;
TEST_F(EngineVfsTest, AddFileVFS) { TEST_F(EngineVfsTest, AddFileVFS) {
constexpr char path[] = "engine/testdata/"; constexpr char path[] = "engine/testdata/";
const std::string dir = GetTestDataFilePath(path); const std::string dir = GetTestDataFilePath(path);
std::string file = "refsite.xml"; std::string file1 = "activation.xml";
std::string file2 = "damper.xml";
std::string file3 = "refsite.xml";
std::FILE* fp = std::fopen((dir + file).c_str(), "r"); std::FILE* fp1 = std::fopen((dir + file1).c_str(), "r");
ASSERT_THAT(fp, NotNull()) << "Input file missing."; ASSERT_THAT(fp1, NotNull()) << "Input file1 missing.";
std::fclose(fp); std::fclose(fp1);
std::FILE* fp2 = std::fopen((dir + file2).c_str(), "r");
ASSERT_THAT(fp2, NotNull()) << "Input file2 missing.";
std::fclose(fp2);
std::FILE* fp3 = std::fopen((dir + file3).c_str(), "r");
ASSERT_THAT(fp3, NotNull()) << "Input file3 missing.";
std::fclose(fp3);
auto mj_vfs = std::make_unique<mjVFS>(); auto mj_vfs = std::make_unique<mjVFS>();
mj_defaultVFS(mj_vfs.get()); mj_defaultVFS(mj_vfs.get());
EXPECT_THAT(mj_addFileVFS(mj_vfs.get(), dir.c_str(), file.c_str()), 0);
EXPECT_THAT(mj_vfs->nfile, 0);
EXPECT_THAT(mj_addFileVFS(mj_vfs.get(), dir.c_str(), file1.c_str()), 0);
EXPECT_THAT(mj_vfs->nfile, 1); EXPECT_THAT(mj_vfs->nfile, 1);
mj_deleteFileVFS(mj_vfs.get(), file.c_str()); EXPECT_THAT(mj_addFileVFS(mj_vfs.get(), dir.c_str(), file2.c_str()), 0);
EXPECT_THAT(mj_vfs->nfile, 2);
EXPECT_THAT(mj_addFileVFS(mj_vfs.get(), dir.c_str(), file3.c_str()), 0);
EXPECT_THAT(mj_vfs->nfile, 3);
mj_deleteFileVFS(mj_vfs.get(), file1.c_str());
EXPECT_THAT(mj_vfs->nfile, 2);
mj_deleteFileVFS(mj_vfs.get(), file2.c_str());
EXPECT_THAT(mj_vfs->nfile, 1);
mj_deleteFileVFS(mj_vfs.get(), file3.c_str());
EXPECT_THAT(mj_vfs->nfile, 0);
mj_deleteVFS(mj_vfs.get()); mj_deleteVFS(mj_vfs.get());
} }