Skip to content

Commit e369d2f

Browse files
authored
Merge pull request #850 from openziti/ctrl-detail-missing-edge-v1
fix crash if ctrl detail missing edge version
2 parents e4fd77e + 151c352 commit e369d2f

File tree

3 files changed

+8
-7
lines changed

3 files changed

+8
-7
lines changed

.github/workflows/build-release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ jobs:
1818
fail-fast: false
1919
matrix:
2020
spec:
21-
- { name: 'Linux x86_64', runner: 'ubuntu-20.04', target: 'linux-x64', builder: 'openziti/ziti-builder:v2' }
22-
- { name: 'Linux ARM', runner: 'ubuntu-20.04', target: 'linux-arm', builder: 'openziti/ziti-builder:v2' }
23-
- { name: 'Linux ARM64', runner: 'ubuntu-20.04', target: 'linux-arm64', builder: 'openziti/ziti-builder:v2' }
21+
- { name: 'Linux x86_64', runner: 'ubuntu-latest', target: 'linux-x64', builder: 'openziti/ziti-builder:v2' }
22+
- { name: 'Linux ARM', runner: 'ubuntu-latest', target: 'linux-arm', builder: 'openziti/ziti-builder:v2' }
23+
- { name: 'Linux ARM64', runner: 'ubuntu-latest', target: 'linux-arm64', builder: 'openziti/ziti-builder:v2' }
2424
- { name: 'MacOS x86_64', runner: 'macOS-13', target: 'macOS-x64' }
2525
- { name: 'MacOS arm64', runner: 'macOS-14', target: 'macOS-arm64' }
2626
- { name: 'Windows x86_64', runner: 'windows-2022', target: 'windows-x64' }

.github/workflows/cmake.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ jobs:
2525
fail-fast: false
2626
matrix:
2727
spec:
28-
- { name: 'Linux x86_64', runner: 'ubuntu-20.04', target: 'linux-x64', builder: 'openziti/ziti-builder:v2', test: 'true' }
29-
- { name: 'Linux ARM', runner: 'ubuntu-20.04', target: 'linux-arm', builder: 'openziti/ziti-builder:v2' }
30-
- { name: 'Linux ARM64', runner: 'ubuntu-20.04', target: 'linux-arm64', builder: 'openziti/ziti-builder:v2' }
28+
- { name: 'Linux x86_64', runner: 'ubuntu-latest', target: 'linux-x64', builder: 'openziti/ziti-builder:v2', test: 'true' }
29+
- { name: 'Linux ARM', runner: 'ubuntu-latest', target: 'linux-arm', builder: 'openziti/ziti-builder:v2' }
30+
- { name: 'Linux ARM64', runner: 'ubuntu-latest', target: 'linux-arm64', builder: 'openziti/ziti-builder:v2' }
3131
- { name: 'MacOS x86_64', runner: 'macOS-13', target: 'macOS-x64', test: 'true' }
3232
- { name: 'MacOS arm64', runner: 'macOS-14', target: 'macOS-arm64', test: 'true' }
3333
- { name: 'Windows x86_64', runner: 'windows-2022', target: 'windows-x64', test: 'true' }

library/ziti_ctrl.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ static void internal_ctrl_list_cb(ziti_controller_detail_array arr, const ziti_e
293293
api_address *addr = NULL;
294294
MODEL_LIST_FOREACH(addr, d->apis.edge) {
295295
CTRL_LOG(VERBOSE, "%s/%s", addr->version, addr->url);
296-
if (strcmp(addr->version, "v1") == 0) {
296+
if (addr->version && strcmp(addr->version, "v1") == 0) {
297297
break;
298298
}
299299
addr = NULL;
@@ -309,6 +309,7 @@ static void internal_ctrl_list_cb(ziti_controller_detail_array arr, const ziti_e
309309
change = change || (old_detail->is_online != d->is_online);
310310
}
311311
} else {
312+
CTRL_LOG(DEBUG, "ctrl[%s] has no edge/v1 endpoint", d->name);
312313
free_ziti_controller_detail_ptr(d);
313314
}
314315
}

0 commit comments

Comments
 (0)