Skip to content

Fix: mdstcl's show current no longer segfaults when no tree paths defined #2754

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
mwinkel-dev merged 3 commits into from
Apr 30, 2024
Merged

Fix: mdstcl's show current no longer segfaults when no tree paths defined #2754

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c776b32
Fix: "show current" no longer segfaults when no tree paths defined
Apr 30, 2024
ce93809
Fix: corrected typo in error message
Apr 30, 2024
3cb89df
Use original error message so tests pass
Apr 30, 2024
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: 4 additions & 0 deletions treeshr/TreeGetSetShotId.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,13 +137,17 @@ int WriteShotId(char * filename, int shot, int mode)
return status;
}

// On error returns 0 (a non-MDSplus error viewed as failure by the status macros)
int TreeGetCurrentShotId(char const *experiment)
{
int shot = 0;
int status = TreeFAILURE;
char experiment_lower[16] = {0};
size_t slen;
char * pathlist = TreePath(experiment, experiment_lower);
if (pathlist == NULL) {
return 0;
}
char * filename;
char * saveptr = NULL;
char * path = strtok_r(pathlist, TREE_PATH_LIST_DELIM, &saveptr);
Expand Down