Skip to content

Some changes to fix memory leaks #23

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

Open
gmcastil wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Some changes to fix memory leaks #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6b3cc76
Fixed a memory leak in the uio_find_devices() function
gmcastil Jan 3, 2025
9bf2f19
Needed to use the `uio_free_info()` helper function
gmcastil Jan 3, 2025
2729c57
Inserted an error report to be consistent with the rest of the library
gmcastil Jan 3, 2025
08ac9c5
Fixed the last freeing of resources and added a missing function
gmcastil Jan 3, 2025
b044480
Reverted file to previous version
gmcastil Jan 3, 2025
c34722d
Merge branch 'master' into fix-mem-leak
gmcastil Jan 3, 2025
c36f5d9
Removed some comments and an assertion that was unnecessary
gmcastil Jan 6, 2025
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
14 changes: 10 additions & 4 deletions base.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,8 +186,14 @@ void uio_free_info(struct uio_info_t* info)
free (info->name);
if (info->version)
free (info->version);
if (info->maps)
free (info->maps);
if (info->maps) {
for (int i = 0; i < info->maxmap; i++) {
if (info->maps[i].name) {
free(info->maps[i].name);
}
}
free(info->maps);
}
if (info->devname)
free (info->devname);
free (info);
Expand Down Expand Up @@ -216,7 +222,6 @@ struct uio_info_t **uio_find_devices ()
info = calloc (nr, sizeof (struct uio_info_t *));
if (!info)
{
errno = ENOMEM;
g_warning (_("calloc: %s\n"), g_strerror (errno));
goto out;
}
Expand Down Expand Up @@ -263,7 +268,8 @@ struct uio_info_t *uio_find_by_uio_name (char *uio_name)

if (!strcmp (name, uio_name)) {
info = candidate;
break;
} else {
uio_free_info(candidate);
}
}
free (uio_list);
Expand Down
4 changes: 3 additions & 1 deletion helper.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,8 +293,10 @@ struct uio_info_t *create_uio_info (char *dir, char *name)
char filename [PATH_MAX];

info = calloc (1, sizeof (struct uio_info_t));
if (!info)
if (!info) {
g_warning (_("calloc: %s\n"), g_strerror (errno));
return NULL;
}

snprintf (filename, PATH_MAX, "%s/%s", dir, name);
info->path = strdup (filename);
Expand Down
1 change: 1 addition & 0 deletions libuio.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ extern "C" {
struct uio_info_t;

/* base functions */
void uio_free_info(struct uio_info_t* info);
struct uio_info_t **uio_find_devices ();
struct uio_info_t *uio_find_by_uio_name (char *uio_name);
struct uio_info_t *uio_find_by_uio_num (int num);
Expand Down