diff options
| author | Drew DeVault <sir@cmpwn.com> | 2016-12-17 13:23:44 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-17 13:23:44 -0500 |
| commit | f04ee0e68d885d7e1101cc88f9a9337202041f1f (patch) | |
| tree | fa4dc296a5f1377867752d320ceef4e4b0178bbf /sway/container.c | |
| parent | 6c0fc2093641868df28c4087902a040f7fae05d4 (diff) | |
| parent | d859f825d3612492678f5cd6cc6dc1f2647929e1 (diff) | |
| download | sway-f04ee0e68d885d7e1101cc88f9a9337202041f1f.tar.xz | |
Merge pull request #995 from SirCmpwn/memory-use
Handle allocation failures
Diffstat (limited to 'sway/container.c')
| -rw-r--r-- | sway/container.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sway/container.c b/sway/container.c index e5284200..d9677cdb 100644 --- a/sway/container.c +++ b/sway/container.c @@ -23,6 +23,9 @@ static swayc_t *new_swayc(enum swayc_types type) { // next id starts at 1 because 0 is assigned to root_container in layout.c static size_t next_id = 1; swayc_t *c = calloc(1, sizeof(swayc_t)); + if (!c) { + return NULL; + } c->id = next_id++; c->handle = -1; c->gaps = -1; @@ -217,7 +220,7 @@ swayc_t *new_workspace(swayc_t *output, const char *name) { workspace->y = output->y; workspace->width = output->width; workspace->height = output->height; - workspace->name = strdup(name); + workspace->name = !name ? NULL : strdup(name); workspace->visible = false; workspace->floating = create_list(); |