ui/vnc: assert preconditions instead of silently returning
Replace defensive NULL guards with assert() in vnc_display_close() and vnc_display_open(). These are internal functions whose callers guarantee non-NULL arguments, so a NULL value would indicate a programming error rather than a runtime condition. Reviewed-by: Daniel P. Berrangé <berrange@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Marc-André Lureau committed
Feb 24, 2026 at 16:40 UTC
2823b97cb1706d31f751fa4ae740bf2480710211
1 file changed
+4
-11
ui/vnc.c
+4
-11
@@ -3467,9 +3467,7 @@ void vnc_display_init(const char *id, Error **errp)
3467
3468
static void vnc_display_close(VncDisplay *vd)
3469
{
3470
- if (!vd) {
3471
- return;
3472
- }
3470
+ assert(vd);
3471
3472
if (vd->listener) {
3473
qio_net_listener_disconnect(vd->listener);
@@ -4070,15 +4068,10 @@ void vnc_display_open(const char *id, Error **errp)
4068
const char *audiodev;
4069
const char *passwordSecret;
4070
4073
- if (!vd) {
4074
- error_setg(errp, "VNC display not active");
4075
- return;
4076
- }
4077
- vnc_display_close(vd);
4071
+ assert(vd);
4072
+ assert(opts);
4073
4079
- if (!opts) {
4080
- return;
4081
- }
4074
+ vnc_display_close(vd);
4075
4076
reverse = qemu_opt_get_bool(opts, "reverse", false);
4077
if (vnc_display_get_addresses(opts, reverse, &saddr_list, &wsaddr_list,