diff options
| author | Benjamin Dürholt <b.duerholt@portunity.de> | 2015-04-10 12:16:15 +0200 |
|---|---|---|
| committer | Benjamin Dürholt <b.duerholt@portunity.de> | 2015-04-10 12:16:15 +0200 |
| commit | 4c1bd4e76e0cdbb61b38e31d408fff86a3203433 (patch) | |
| tree | 173d2bd3fe9879e081d4669fb4496c30543f924c | |
| parent | 344264da2facfd2ffba4e2f567be6d2c14b6d63b (diff) | |
| download | libtdevnc-4c1bd4e76e0cdbb61b38e31d408fff86a3203433.tar.gz libtdevnc-4c1bd4e76e0cdbb61b38e31d408fff86a3203433.zip | |
prevent segfault
| -rw-r--r-- | libvncserver/rfbssl_gnutls.c | 2 | ||||
| -rw-r--r-- | libvncserver/tight.c | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/libvncserver/rfbssl_gnutls.c b/libvncserver/rfbssl_gnutls.c index cf60cdc..fb3a0e7 100644 --- a/libvncserver/rfbssl_gnutls.c +++ b/libvncserver/rfbssl_gnutls.c @@ -109,6 +109,8 @@ struct rfbssl_ctx *rfbssl_init_global(char *key, char *cert) gnutls_global_set_log_function(rfbssl_log_func); gnutls_global_set_log_level(1); gnutls_certificate_set_dh_params(ctx->x509_cred, ctx->dh_params); + //newly allocated memory should be initialized, at least where it is important + ctx->peekstart = ctx->peeklen = 0; return ctx; } diff --git a/libvncserver/tight.c b/libvncserver/tight.c index 276a2e3..8eb7380 100644 --- a/libvncserver/tight.c +++ b/libvncserver/tight.c @@ -163,7 +163,11 @@ void rfbTightCleanup (rfbScreenInfoPtr screen) tightAfterBufSize = 0; tightAfterBuf = NULL; } - if (j) tjDestroy(j); + if (j) { + tjDestroy(j); + //Set freed resource handle to 0! + j = 0; + } } |