Skip to content

Fix: mdsmisc GetXYSignalXd() invalid free xd on error (#2373) #2405

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
joshStillerman merged 3 commits into from
Nov 3, 2021
Merged

Fix: mdsmisc GetXYSignalXd() invalid free xd on error (#2373) #2405

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ed1e521
Fix: mdsmisc GetXYSignalXd() invalid free xd on error (#2373)
zack-vii Aug 26, 2021
dd2e022
Fix: need windows build fix
joshStillerman Nov 3, 2021
228c165
Ignore editor .swp files
joshStillerman Nov 3, 2021
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
6 changes: 3 additions & 3 deletions mdsmisc/ScopeUtilities.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -886,6 +886,9 @@ EXPORT int GetXYSignalXd(mdsdsc_t *const inY, mdsdsc_t *const inX,
return TdiNULL_PTR;
EMPTYXD(yXd);
EMPTYXD(xXd);
EMPTYXD(title);
EMPTYXD(xLabel);
EMPTYXD(yLabel);
int estimatedSegmentSamples = 0;
int isLong = FALSE;
double xmin = -INFINITY, xmax = INFINITY; // requested
Expand Down Expand Up @@ -936,9 +939,6 @@ EXPORT int GetXYSignalXd(mdsdsc_t *const inY, mdsdsc_t *const inX,
if (STATUS_NOT_OK)
goto return_err;
// Get Y, title, and yLabel, if any
EMPTYXD(title);
EMPTYXD(xLabel);
EMPTYXD(yLabel);
recGetHelp(yXd.pointer, &title);
recGetUnits(yXd.pointer, &yLabel);
// Get X
Expand Down