diff options
| author | Drew DeVault <[email protected]> | 2016-12-15 18:26:53 -0500 |
|---|---|---|
| committer | Drew DeVault <[email protected]> | 2016-12-15 19:01:41 -0500 |
| commit | 10c8b73075fa0dd5512cc14be7240ec47f68dece (patch) | |
| tree | e8835ef640d1d21ce0f36a5b1bcee726d926e55e /sway/ipc-json.c | |
| parent | a2b914965686bb4352b8ebc4a46d898f5a793647 (diff) | |
Handle calloc failures
Diffstat (limited to 'sway/ipc-json.c')
| -rw-r--r-- | sway/ipc-json.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/sway/ipc-json.c b/sway/ipc-json.c index e65e9de3..fd17216e 100644 --- a/sway/ipc-json.c +++ b/sway/ipc-json.c @@ -245,6 +245,15 @@ json_object *ipc_json_get_version() { #if defined SWAY_GIT_VERSION && defined SWAY_GIT_BRANCH && defined SWAY_VERSION_DATE char *full_version = calloc(strlen(SWAY_GIT_VERSION) + strlen(SWAY_GIT_BRANCH) + strlen(SWAY_VERSION_DATE) + 20, 1); + if (!full_version) { + json_object_object_add(version, "human_readable", + json_object_new_string("Allocating version string failed")); + // TODO: it's stupid that we allocate this in the first place + json_object_object_add(version, "major", json_object_new_int(0)); + json_object_object_add(version, "minor", json_object_new_int(0)); + json_object_object_add(version, "patch", json_object_new_int(0)); + return version; + } strcat(full_version, SWAY_GIT_VERSION); strcat(full_version, " ("); strcat(full_version, SWAY_VERSION_DATE); |