aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChristopher James Halse Rogers <christopher.halse.rogers@canonical.com>2018-11-20 18:02:50 +1100
committerPekka Paalanen <pekka.paalanen@collabora.com>2019-01-29 15:58:19 +0200
commitd325140289d5767cdef5fc31f7d89b451c1066aa (patch)
treeef2bf07585035be33022425087cd6d265d25c959 /src
parentserver: Split out varargs version of wl_resource_post_error. (diff)
downloadwayland-d325140289d5767cdef5fc31f7d89b451c1066aa.tar
wayland-d325140289d5767cdef5fc31f7d89b451c1066aa.tar.gz
wayland-d325140289d5767cdef5fc31f7d89b451c1066aa.tar.bz2
wayland-d325140289d5767cdef5fc31f7d89b451c1066aa.tar.lz
wayland-d325140289d5767cdef5fc31f7d89b451c1066aa.tar.xz
wayland-d325140289d5767cdef5fc31f7d89b451c1066aa.tar.zst
wayland-d325140289d5767cdef5fc31f7d89b451c1066aa.zip
proto, server: Add internal server error message. (v2)
Many languages such as C++ or Rust have an unwinding error-reporting mechanism. Code in these languages can (and must!) wrap request handling callbacks in unwind guards to avoid undefined behaviour. As a consequence such code will detect internal server errors, but have no way to communicate such failures to the client. This adds a WL_DISPLAY_ERROR_IMPLEMENTATION error to wl_display so that such code can notify (and disconnect) clients which hit internal bugs. While servers can currently abuse other wl_display errors for the same effect, adding an explicit error code allows clients to tell the difference between errors which are their fault and errors which are the server's fault. This is particularly interesting for automated bug reporting. v2: Rename error from "internal" to "implementation", in sympathy with X11's BadImplementation error. Add more justification in the commit message. Signed-off-by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com> Acked-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk> Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.com>
Diffstat (limited to 'src')
-rw-r--r--src/wayland-client.c3
-rw-r--r--src/wayland-server-core.h4
-rw-r--r--src/wayland-server.c24
3 files changed, 31 insertions, 0 deletions
diff --git a/src/wayland-client.c b/src/wayland-client.c
index 0ccfc66..b0805f1 100644
--- a/src/wayland-client.c
+++ b/src/wayland-client.c
@@ -185,6 +185,9 @@ display_protocol_error(struct wl_display *display, uint32_t code,
case WL_DISPLAY_ERROR_NO_MEMORY:
err = ENOMEM;
break;
+ case WL_DISPLAY_ERROR_IMPLEMENTATION:
+ err = EPROTO;
+ break;
default:
err = EFAULT;
}
diff --git a/src/wayland-server-core.h b/src/wayland-server-core.h
index 2e725d9..3e0272b 100644
--- a/src/wayland-server-core.h
+++ b/src/wayland-server-core.h
@@ -325,6 +325,10 @@ void
wl_client_post_no_memory(struct wl_client *client);
void
+wl_client_post_implementation_error(struct wl_client *client,
+ const char* msg, ...) WL_PRINTF(2,3);
+
+void
wl_client_add_resource_created_listener(struct wl_client *client,
struct wl_listener *listener);
diff --git a/src/wayland-server.c b/src/wayland-server.c
index c0ad229..19f6a76 100644
--- a/src/wayland-server.c
+++ b/src/wayland-server.c
@@ -650,6 +650,30 @@ wl_client_post_no_memory(struct wl_client *client)
WL_DISPLAY_ERROR_NO_MEMORY, "no memory");
}
+/** Report an internal server error
+ *
+ * \param client The client object
+ * \param msg A printf-style format string
+ * \param ... Format string arguments
+ *
+ * Report an unspecified internal implementation error and disconnect
+ * the client.
+ *
+ * \memberof wl_client
+ */
+WL_EXPORT void
+wl_client_post_implementation_error(struct wl_client *client,
+ char const *msg, ...)
+{
+ va_list ap;
+
+ va_start(ap, msg);
+ wl_resource_post_error_vargs(client->display_resource,
+ WL_DISPLAY_ERROR_IMPLEMENTATION,
+ msg, ap);
+ va_end(ap);
+}
+
WL_EXPORT void
wl_resource_post_no_memory(struct wl_resource *resource)
{