Skip to content
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.

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

Switched sanitizer to run on macOS-13. This means it does NOT check f… #304

Merged
merged 2 commits into from
Sep 5, 2024
Merged
Changes from 1 commit
Commits
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
Next Next commit
Switched sanitizer to run on macOS-13. This means it does NOT check f…
…or memory leaks, only buffer overflows (which is OK).

Added a few frees that I missed.
  • Loading branch information
Rory Barnes committed Sep 4, 2024
commit 324d3999e854c614f14b47129377c39d818fd676
4 changes: 2 additions & 2 deletions .github/workflows/sanitizer.yml
Original file line number Diff line number Diff line change
@@ -7,8 +7,8 @@ on:

jobs:
sanitizer:
name: Run address-sanitizer on Ubuntu
runs-on: ubuntu-latest
name: Run address-sanitizer on macOS
runs-on: macos-13
strategy:
fail-fast: false

6 changes: 2 additions & 4 deletions src/output.c
Original file line number Diff line number Diff line change
@@ -2041,6 +2041,8 @@ void LogOutputOrder(BODY *body, CONTROL *control, FILES *files, OUTPUT *output,
}
fprintf(fp, "\n");
free(cCol);
free(cUnit);
free(cTmp);
}

void LogGridOutput(BODY *body, CONTROL *control, FILES *files, OUTPUT *output,
@@ -2174,7 +2176,6 @@ void LogBody(BODY *body, CONTROL *control, FILES *files, MODULE *module,
void WriteLog(BODY *body, CONTROL *control, FILES *files, MODULE *module,
OPTIONS *options, OUTPUT *output, SYSTEM *system, UPDATE *update,
fnUpdateVariable ***fnUpdate, fnWriteOutput fnWrite[], int iEnd) {
char *cTime=NULL;
FILE *fp;
double dTotTime;

@@ -2186,13 +2187,10 @@ void WriteLog(BODY *body, CONTROL *control, FILES *files, MODULE *module,
double dDt = fdGetTimeStep(body, control, system, update, fnUpdate);

if (iEnd == 0) {
fvFormattedString(&cTime, "Input");
fp = fopen(files->cLog, "w");
} else if (iEnd == 1) {
fvFormattedString(&cTime, "Final");
fp = fopen(files->cLog, "a");
} else if (iEnd == -1) {
fvFormattedString(&cTime, "Initial");
fp = fopen(files->cLog, "w");
} else {
fprintf(stderr, "ERROR: Unknown cTime in output.c:WriteLog.\n");
Loading