1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
|
From 78bdd1700c4e42b492286a2af25bea0825848f99 Mon Sep 17 00:00:00 2001
From: Pierre Ossman <ossman@cendio.se>
Date: Tue, 26 Mar 2019 11:10:28 +0100
Subject: [PATCH] Add missing throws for exception
It is not enough to create an exception object, you need to throw
it as well.
---
common/rfb/CSecurityTLS.cxx | 10 +++++-----
win/rfb_win32/Registry.cxx | 2 +-
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/common/rfb/CSecurityTLS.cxx b/common/rfb/CSecurityTLS.cxx
index c6d1e3103..aa1910909 100644
--- a/common/rfb/CSecurityTLS.cxx
+++ b/common/rfb/CSecurityTLS.cxx
@@ -391,7 +391,7 @@ void CSecurityTLS::checkSession()
"authority:\n\n%s\n\nDo you want to save it and "
"continue?\n ", info.data);
if (len < 0)
- AuthFailureException("certificate decoding error");
+ throw AuthFailureException("certificate decoding error");
vlog.debug("%s", info.data);
@@ -417,16 +417,16 @@ void CSecurityTLS::checkSession()
if (gnutls_x509_crt_export(crt, GNUTLS_X509_FMT_PEM, NULL, &out_size)
== GNUTLS_E_SHORT_MEMORY_BUFFER)
- AuthFailureException("Out of memory");
+ throw AuthFailureException("Out of memory");
// Save cert
out_buf = new char[out_size];
if (out_buf == NULL)
- AuthFailureException("Out of memory");
+ throw AuthFailureException("Out of memory");
if (gnutls_x509_crt_export(crt, GNUTLS_X509_FMT_PEM, out_buf, &out_size) < 0)
- AuthFailureException("certificate issuer unknown, and certificate "
- "export failed");
+ throw AuthFailureException("certificate issuer unknown, and certificate "
+ "export failed");
char *homeDir = NULL;
if (getvnchomedir(&homeDir) == -1)
diff --git a/win/rfb_win32/Registry.cxx b/win/rfb_win32/Registry.cxx
index 963a36a29..9cd501842 100644
--- a/win/rfb_win32/Registry.cxx
+++ b/win/rfb_win32/Registry.cxx
@@ -254,7 +254,7 @@ TCHAR* RegKey::getRepresentation(const TCHAR* valname) const {
TCharArray result(required);
length = ExpandEnvironmentStrings(str.buf, result.buf, required);
if (required<length)
- rdr::Exception("unable to expand environment strings");
+ throw rdr::Exception("unable to expand environment strings");
return result.takeBuf();
} else {
return tstrDup(_T(""));
|
