| Message ID | 1430477086-26830-1-git-send-email-berrange@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 05/01/2015 04:44 AM, Daniel P. Berrange wrote: > The qemu_acl_init() function has long since stopped being able > to return NULL, since g_malloc will abort on OOM. As such the > checks for NULL were unreachable code. > > Signed-off-by: Daniel P. Berrange <berrange@redhat.com> > --- > ui/vnc.c | 8 -------- > 1 file changed, 8 deletions(-) Reviewed-by: Eric Blake <eblake@redhat.com>
On Fr, 2015-05-01 at 11:44 +0100, Daniel P. Berrange wrote: > The qemu_acl_init() function has long since stopped being able > to return NULL, since g_malloc will abort on OOM. As such the > checks for NULL were unreachable code. added to vnc queue. thanks, Gerd
diff --git a/ui/vnc.c b/ui/vnc.c index cffb5b7..6bfe228 100644 --- a/ui/vnc.c +++ b/ui/vnc.c @@ -3602,10 +3602,6 @@ void vnc_display_open(const char *id, Error **errp) aclname = g_strdup_printf("vnc.%s.x509dname", vs->id); } vs->tls.acl = qemu_acl_init(aclname); - if (!vs->tls.acl) { - fprintf(stderr, "Failed to create x509 dname ACL\n"); - exit(1); - } g_free(aclname); } #endif @@ -3619,10 +3615,6 @@ void vnc_display_open(const char *id, Error **errp) aclname = g_strdup_printf("vnc.%s.username", vs->id); } vs->sasl.acl = qemu_acl_init(aclname); - if (!vs->sasl.acl) { - fprintf(stderr, "Failed to create username ACL\n"); - exit(1); - } g_free(aclname); } #endif
The qemu_acl_init() function has long since stopped being able to return NULL, since g_malloc will abort on OOM. As such the checks for NULL were unreachable code. Signed-off-by: Daniel P. Berrange <berrange@redhat.com> --- ui/vnc.c | 8 -------- 1 file changed, 8 deletions(-)