[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 7/9] ui: avoid 'local_err' variable shadowing in VNC
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 7/9] ui: avoid 'local_err' variable shadowing in VNC SASL auth |
Date: |
Fri, 16 Feb 2018 12:54:08 +0100 |
From: Daniel P. Berrangé <address@hidden>
The start_auth_sasl() method declares a 'Error *local_err' variable in
an inner if () {...} scope, which shadows a variable of the same name
declared at the start of the method. This is confusing for reviewers and
may trigger compiler warnings.
Reported-by: Laszlo Ersek <address@hidden>
Signed-off-by: Daniel P. Berrangé <address@hidden>
Reviewed-by: Laszlo Ersek <address@hidden>
Reviewed-by: Philippe Mathieu-Daudé <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>
---
ui/vnc-auth-sasl.c | 2 --
1 file changed, 2 deletions(-)
diff --git a/ui/vnc-auth-sasl.c b/ui/vnc-auth-sasl.c
index fbccca8c8a..8ebd0d3d00 100644
--- a/ui/vnc-auth-sasl.c
+++ b/ui/vnc-auth-sasl.c
@@ -556,7 +556,6 @@ void start_auth_sasl(VncState *vs)
/* Inform SASL that we've got an external SSF layer from TLS/x509 */
if (vs->auth == VNC_AUTH_VENCRYPT &&
vs->subauth == VNC_AUTH_VENCRYPT_X509SASL) {
- Error *local_err = NULL;
int keysize;
sasl_ssf_t ssf;
@@ -565,7 +564,6 @@ void start_auth_sasl(VncState *vs)
if (keysize < 0) {
trace_vnc_auth_fail(vs, vs->auth, "cannot TLS get cipher size",
error_get_pretty(local_err));
- error_free(local_err);
sasl_dispose(&vs->sasl.conn);
vs->sasl.conn = NULL;
goto authabort;
--
2.9.3
- [Qemu-devel] [PULL 0/9] Ui 20180216 patches, Gerd Hoffmann, 2018/02/16
- [Qemu-devel] [PULL 6/9] ui: avoid risk of 32-bit int overflow in VNC buffer check, Gerd Hoffmann, 2018/02/16
- [Qemu-devel] [PULL 4/9] sdl: restore optimized redraw, Gerd Hoffmann, 2018/02/16
- [Qemu-devel] [PULL 7/9] ui: avoid 'local_err' variable shadowing in VNC SASL auth,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 1/9] vnc: remove bogus object_unref on client socket, Gerd Hoffmann, 2018/02/16
- [Qemu-devel] [PULL 5/9] sdl2: fix mouse grab, Gerd Hoffmann, 2018/02/16
- [Qemu-devel] [PULL 3/9] vnc: fix segfault in closed connection handling, Gerd Hoffmann, 2018/02/16
- [Qemu-devel] [PULL 9/9] ui: extend VNC trottling tracing to SASL codepaths, Gerd Hoffmann, 2018/02/16
- [Qemu-devel] [PULL 8/9] ui: check VNC audio frequency limit at time of reading from client, Gerd Hoffmann, 2018/02/16
- [Qemu-devel] [PULL 2/9] vnc: add qapi/error.h include to stubs, Gerd Hoffmann, 2018/02/16
- Re: [Qemu-devel] [PULL 0/9] Ui 20180216 patches, Peter Maydell, 2018/02/16