Skip to content

Commit f1824ba

Browse files
author
mwatson
committed
Fix null reference bug in issue 11
1 parent b2ad60c commit f1824ba

File tree

3 files changed

+12
-12
lines changed

3 files changed

+12
-12
lines changed

Dlls/StackifyLib/StackifyLib.dll

0 Bytes
Binary file not shown.

Src/StackifyLib/Config.cs

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,46 +18,46 @@ public static void LoadSettings()
1818
{
1919
try
2020
{
21-
CaptureErrorPostdata = Get("Stackify.CaptureErrorPostdata")
21+
CaptureErrorPostdata = Get("Stackify.CaptureErrorPostdata", "")
2222
.Equals("true", StringComparison.CurrentCultureIgnoreCase);
2323

24-
CaptureServerVariables = Get("Stackify.CaptureServerVariables")
24+
CaptureServerVariables = Get("Stackify.CaptureServerVariables", "")
2525
.Equals("true", StringComparison.CurrentCultureIgnoreCase);
26-
CaptureSessionVariables = Get("Stackify.CaptureSessionVariables")
26+
CaptureSessionVariables = Get("Stackify.CaptureSessionVariables", "")
2727
.Equals("true", StringComparison.CurrentCultureIgnoreCase);
2828

29-
CaptureErrorHeaders = Get("Stackify.CaptureErrorHeaders")
29+
CaptureErrorHeaders = Get("Stackify.CaptureErrorHeaders", "")
3030
.Equals("true", StringComparison.CurrentCultureIgnoreCase);
3131

32-
CaptureErrorCookies = Get("Stackify.CaptureErrorCookies")
32+
CaptureErrorCookies = Get("Stackify.CaptureErrorCookies", "")
3333
.Equals("true", StringComparison.CurrentCultureIgnoreCase);
3434

35-
CaptureErrorHeadersWhitelist = Get("Stackify.CaptureErrorHeadersWhitelist");
35+
CaptureErrorHeadersWhitelist = Get("Stackify.CaptureErrorHeadersWhitelist", "");
3636

3737
if (!string.IsNullOrEmpty(CaptureErrorHeadersWhitelist))
3838
{
3939
ErrorHeaderGoodKeys = CaptureErrorHeadersWhitelist.Split(",".ToCharArray(), StringSplitOptions.RemoveEmptyEntries).ToList();
4040
}
4141

42-
CaptureErrorHeadersBlacklist = Get("Stackify.CaptureErrorHeadersBlacklist");
42+
CaptureErrorHeadersBlacklist = Get("Stackify.CaptureErrorHeadersBlacklist", "");
4343
if (!string.IsNullOrEmpty(CaptureErrorHeadersBlacklist))
4444
{
4545
ErrorHeaderBadKeys = CaptureErrorHeadersBlacklist.Split(",".ToCharArray(), StringSplitOptions.RemoveEmptyEntries).ToList();
4646
}
4747

48-
CaptureErrorCookiesWhitelist = Get("Stackify.CaptureErrorCookiesWhitelist");
48+
CaptureErrorCookiesWhitelist = Get("Stackify.CaptureErrorCookiesWhitelist", "");
4949
if (!string.IsNullOrEmpty(CaptureErrorCookiesWhitelist))
5050
{
5151
ErrorCookiesGoodKeys = CaptureErrorCookiesWhitelist.Split(",".ToCharArray(), StringSplitOptions.RemoveEmptyEntries).ToList();
5252
}
5353

54-
CaptureErrorCookiesBlacklist = Get("Stackify.CaptureErrorCookiesBlacklist");
54+
CaptureErrorCookiesBlacklist = Get("Stackify.CaptureErrorCookiesBlacklist", "");
5555
if (!string.IsNullOrEmpty(CaptureErrorCookiesBlacklist))
5656
{
5757
ErrorCookiesBadKeys = CaptureErrorCookiesBlacklist.Split(",".ToCharArray(), StringSplitOptions.RemoveEmptyEntries).ToList();
5858
}
5959

60-
CaptureErrorSessionWhitelist = Get("Stackify.CaptureErrorSessionWhitelist");
60+
CaptureErrorSessionWhitelist = Get("Stackify.CaptureErrorSessionWhitelist", "");
6161
if (!string.IsNullOrEmpty(CaptureErrorSessionWhitelist))
6262
{
6363
ErrorSessionGoodKeys = CaptureErrorSessionWhitelist.Split(",".ToCharArray(), StringSplitOptions.RemoveEmptyEntries).ToList();
@@ -117,7 +117,7 @@ internal static string Get(string key, string defaultValue = null)
117117
if (v == null)
118118
v = defaultValue;
119119
}
120-
return v ?? "";
120+
return v;
121121
}
122122
}
123123
}

Src/StackifyLib/Utils/HttpClient.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ public HttpClient(string apiKey, string apiUrl)
108108
//To account for our initial release which had a URL just for the error module
109109
string workaround = Config.Get("Stackify.Url");
110110

111-
if (workaround != null)
111+
if (!string.IsNullOrEmpty(workaround))
112112
{
113113
workaround = System.Web.VirtualPathUtility.RemoveTrailingSlash(workaround);
114114

0 commit comments

Comments
 (0)