diff options
| author |  James Murphy <james.murphy.debian@gmail.com> | 2016-08-20 16:24:08 +0000 |
|---|---|---|
| committer | James Murphy <james.murphy.debian@gmail.com> | 2016-08-20 16:24:08 +0000 |
| commit | 8af49eb696b76adebb17fb9223027d790a0f6567 (patch) | |
| tree | 57de40ae3d12581251bb7499cd1e553153e15a92 | |
| parent | Merge pull request #862 from goetzc/master (diff) | |
| download | sway-8af49eb696b76adebb17fb9223027d790a0f6567.tar.gz sway-8af49eb696b76adebb17fb9223027d790a0f6567.tar.zst sway-8af49eb696b76adebb17fb9223027d790a0f6567.zip | |
Avoid dereferencing null configuration
Fixes: https://github.com/SirCmpwn/sway/issues/865
| -rw-r--r-- | sway/config.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sway/config.c b/sway/config.c index 8531a337..bed233bd 100644 --- a/sway/config.c +++ b/sway/config.c | |||
| @@ -859,7 +859,7 @@ void apply_input_config(struct input_config *ic, struct libinput_device *dev) { | |||
| 859 | } | 859 | } |
| 860 | 860 | ||
| 861 | void apply_output_config(struct output_config *oc, swayc_t *output) { | 861 | void apply_output_config(struct output_config *oc, swayc_t *output) { |
| 862 | if (oc->enabled == 0) { | 862 | if (oc && oc->enabled == 0) { |
| 863 | destroy_output(output); | 863 | destroy_output(output); |
| 864 | return; | 864 | return; |
| 865 | } | 865 | } |