diff options
| author |   Marius Vlad <marius.vlad@collabora.com> | 2023-10-27 16:16:19 +0300 |
|---|---|---|
| committer | Marius Vlad <marius.vlad@collabora.com> | 2023-10-27 16:57:24 +0300 |
| commit | 8c9f4f054a43bb9625872622c46b5ae2a59a1c98 (patch) | |
| tree | d3e92b1c51e47a6c4d7e770bc819fa17dc704587 /grpc-proxy | |
| parent | 7ff5ed29cfe699d6b78bead843991fab9b956c7e (diff) | |
grpc-proxy/main-grpc: Don't fall trough assuming we have a wl_display
Maybe the third time is a charm to avoid fall through and assume on the
exit path we do have a wl_display.
Bug-AGL: SPEC-4935
Reported-by: Lisandro Pérez Meyer <lpmeyer@ics.com>
Tested-by: Lisandro Pérez Meyer <lpmeyer@ics.com>
Signed-off-by: Marius Vlad <marius.vlad@collabora.com>
Change-Id: I4adef5bf72d6b1a32a218bf1cfa6c8ed4450ba48
(cherry picked from commit 0d2e33ded529d216bb5914887b2384e765e3eae7)
Diffstat (limited to 'grpc-proxy')
| -rw-r--r-- | grpc-proxy/main-grpc.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/grpc-proxy/main-grpc.cpp b/grpc-proxy/main-grpc.cpp index 59f1d6b..c8b1bf6 100644 --- a/grpc-proxy/main-grpc.cpp +++ b/grpc-proxy/main-grpc.cpp @@ -387,7 +387,8 @@ __register_shell_init(void) wl_display = wl_display_connect(NULL); if (!wl_display) { - goto err; + ret = -1; + goto err_failed_display; } registry = wl_display_get_registry(wl_display); sh->wait_for_bound = true; @@ -416,6 +417,8 @@ __register_shell_init(void) err: wl_registry_destroy(registry); wl_display_disconnect(wl_display); + +err_failed_display: delete sh; return ret; } |