Skip to content

Fix memory leaks using valgrind #48

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 26, 2022
Merged

Fix memory leaks using valgrind #48

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions source/liblocate/source/liblocate.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,11 +207,9 @@ void getBundlePath(char ** path, unsigned int * pathLength)
}

// Copy contents to caller, create caller ownership
*path = executablePath;
if (pathLength != 0x0)
{
*pathLength = bundlePathLength;
}
copyToStringOutParameter(executablePath, bundlePathLength, path, pathLength);

free(executablePath);
}

void getModulePath(char ** path, unsigned int * pathLength)
Expand Down
5 changes: 5 additions & 0 deletions source/liblocate/source/utils.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,11 @@ unsigned char fileExists(const char * path, unsigned int pathLength)
{
(void)pathLength;

if (path == 0)
{
return 0;
}

#ifdef SYSTEM_WINDOWS

WIN32_FILE_ATTRIBUTE_DATA fileInfo;
Expand Down
15 changes: 15 additions & 0 deletions source/tests/liblocate-test/liblocate_test.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,8 @@ TEST_F(liblocate_test, libPrefix_Return)
ASSERT_NE(nullptr, prefix);
EXPECT_STREQ("lib", prefix);
#endif

free(prefix);
}

TEST_F(liblocate_test, libExtension_NoReturn)
Expand Down Expand Up @@ -251,6 +253,8 @@ TEST_F(liblocate_test, libExtension_Return)
ASSERT_NE(nullptr, extension);
EXPECT_STREQ("so", extension);
#endif

free(extension);
}

TEST_F(liblocate_test, libExtensions_NoReturn)
Expand All @@ -265,6 +269,7 @@ TEST_F(liblocate_test, libExtensions_Return)
char ** extensions;
unsigned int * lengths;
unsigned int count;
unsigned int i;

libExtensions(&extensions, &lengths, &count);

Expand All @@ -290,6 +295,14 @@ TEST_F(liblocate_test, libExtensions_Return)
ASSERT_NE(nullptr, extensions[0]);
EXPECT_STREQ("so", extensions[0]);
#endif

for (i = 0; i < count; ++i)
{
free(extensions[i]);
}

free(lengths);
free(extensions);
}

TEST_F(liblocate_test, homeDir)
Expand All @@ -301,4 +314,6 @@ TEST_F(liblocate_test, homeDir)

EXPECT_NE(nullptr, dir);
EXPECT_LE(0, length);

free(dir);
}