From a92e7bb4cad57cc5c8817fb18fb25650507b69f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= Date: Tue, 12 Sep 2023 10:13:01 +0400 Subject: ui: add precondition for dpy_get_ui_info() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Ensure that it only get called when dpy_ui_info_supported(). The function should always return a result. There should be a non-null console or active_console. Modify the argument to be const as well. Signed-off-by: Marc-André Lureau Reviewed-by: Albert Esteve --- include/ui/console.h | 2 +- ui/console.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/include/ui/console.h b/include/ui/console.h index 79e4702912..28882f15a5 100644 --- a/include/ui/console.h +++ b/include/ui/console.h @@ -329,7 +329,7 @@ void update_displaychangelistener(DisplayChangeListener *dcl, uint64_t interval); void unregister_displaychangelistener(DisplayChangeListener *dcl); -bool dpy_ui_info_supported(QemuConsole *con); +bool dpy_ui_info_supported(const QemuConsole *con); const QemuUIInfo *dpy_get_ui_info(const QemuConsole *con); int dpy_set_ui_info(QemuConsole *con, QemuUIInfo *info, bool delay); diff --git a/ui/console.c b/ui/console.c index aa1e09462c..4a4f19ed33 100644 --- a/ui/console.c +++ b/ui/console.c @@ -801,7 +801,7 @@ static void dpy_set_ui_info_timer(void *opaque) con->hw_ops->ui_info(con->hw, head, &con->ui_info); } -bool dpy_ui_info_supported(QemuConsole *con) +bool dpy_ui_info_supported(const QemuConsole *con) { if (con == NULL) { con = active_console; @@ -815,6 +815,8 @@ bool dpy_ui_info_supported(QemuConsole *con) const QemuUIInfo *dpy_get_ui_info(const QemuConsole *con) { + assert(dpy_ui_info_supported(con)); + if (con == NULL) { con = active_console; } -- cgit v1.2.3