Skip to content

libnml: Fixed memleak in configuration parsing #3701

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
smoe wants to merge 1 commit into
base: master
Choose a base branch
from
+6 −1
Open

libnml: Fixed memleak in configuration parsing #3701

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
4 changes: 3 additions & 1 deletion src/emc/usr_intf/axis/extensions/emcmodule.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2054,7 +2054,9 @@ static PyObject *pydraw_lines(PyObject * /*s*/, PyObject *o) {
if(!first) glEnd();
return NULL;
}
if(first || memcmp(p1, pl, sizeof(p1))

// cppcheck-suppress uninitvar
if(first || memcmp(p1, pl, sizeof(p1)) // <- since first==1 when pl undefined
|| (for_selection && n != nl)) {
if(!first) glEnd();
if(for_selection && n != nl) {
Expand Down
3 changes: 3 additions & 0 deletions src/libnml/cms/cms_cfg.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,8 @@ int load_nml_config_file(const char *file)
if (strlen(file) >= 80) {
rcs_print_error("cms_config: file name too long\n");
loading_config_file = 0;
delete info->lines_list; // info is a struct
delete info;
return -1;
}
rtapi_strlcpy(info->file_name, file, 80);
Expand All @@ -122,6 +124,7 @@ int load_nml_config_file(const char *file)
if (fp == NULL) {
rcs_print_error("cms_config: can't open '%s'. Error = %d -- %s\n",
file, errno, strerror(errno));
delete info->lines_list; // info is a struct
delete info;
loading_config_file = 0;
return -1;
Expand Down
Loading