Skip to content

Fix NullReferenceException in DbConnectionOptions.ConvertValueToBoolean #131650

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
pumpkin-bit wants to merge 1 commit into
base: main
Choose a base branch
from
+51 −36
Open

Fix NullReferenceException in DbConnectionOptions.ConvertValueToBoolean #131650

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
76 changes: 40 additions & 36 deletions src/libraries/Common/src/System/Data/Common/DbConnectionOptions.Common.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,14 +114,18 @@ private string UsersConnectionString(bool hidePassword, bool forceHidePassword)
public bool ConvertValueToBoolean(string keyName, bool defaultValue)
{
string? value;
// TODO: Is it possible for _parsetable to contain a null value here? If so there's a bug here, investigate.
return _parsetable.TryGetValue(keyName, out value) ?
ConvertValueToBooleanInternal(keyName, value!) :
ConvertValueToBooleanInternal(keyName, value) :
defaultValue;
}

internal static bool ConvertValueToBooleanInternal(string keyName, string stringValue)
internal static bool ConvertValueToBooleanInternal(string keyName, string? stringValue)
{
if (stringValue is null)
{
throw ADP.InvalidConnectionOptionValue(keyName);
}

if (CompareInsensitiveInvariant(stringValue, "true") || CompareInsensitiveInvariant(stringValue, "yes"))
return true;
else if (CompareInsensitiveInvariant(stringValue, "false") || CompareInsensitiveInvariant(stringValue, "no"))
Expand Down Expand Up @@ -344,7 +348,7 @@ internal static int GetKeyValuePair(string connectionString, int currentPosition
}
buffer.Append(currentChar);
}
ParserExit:
ParserExit:
switch (parserState)
{
case ParserState.Key:
Expand Down Expand Up @@ -541,48 +545,48 @@ private static void ParseComparison(Dictionary<string, string?> parsetable, stri
try
{
#endif
int nextStartPosition = 0;
int endPosition = connectionString.Length;
while (nextStartPosition < endPosition)
{
int startPosition = nextStartPosition;
int nextStartPosition = 0;
int endPosition = connectionString.Length;
while (nextStartPosition < endPosition)
{
int startPosition = nextStartPosition;

string? keyname, keyvalue;
nextStartPosition = GetKeyValuePair(connectionString, startPosition, buffer, firstKey, out keyname, out keyvalue);
if (string.IsNullOrEmpty(keyname))
{
break;
}
string? keyname, keyvalue;
nextStartPosition = GetKeyValuePair(connectionString, startPosition, buffer, firstKey, out keyname, out keyvalue);
if (string.IsNullOrEmpty(keyname))
{
break;
}
#if DEBUG
DebugTraceKeyValuePair(keyname, keyvalue, synonyms);

Debug.Assert(IsKeyNameValid(keyname), "ParseFailure, invalid keyname");
Debug.Assert(IsValueValidInternal(keyvalue), "parse failure, invalid keyvalue");
#endif
string? synonym;
string? realkeyname = null != synonyms ?
(synonyms.TryGetValue(keyname, out synonym) ? synonym : null) :
keyname;
string? synonym;
string? realkeyname = null != synonyms ?
(synonyms.TryGetValue(keyname, out synonym) ? synonym : null) :
keyname;

if (!IsKeyNameValid(realkeyname))
{
throw ADP.KeywordNotSupported(keyname);
}
if (!firstKey || !parsetable.ContainsKey(realkeyname))
{
parsetable[realkeyname] = keyvalue; // last key-value pair wins (or first)
}
if (!IsKeyNameValid(realkeyname))
{
throw ADP.KeywordNotSupported(keyname);
}
if (!firstKey || !parsetable.ContainsKey(realkeyname))
{
parsetable[realkeyname] = keyvalue; // last key-value pair wins (or first)
}

if (null != localKeychain)
{
localKeychain = localKeychain.Next = new NameValuePair(realkeyname, keyvalue, nextStartPosition - startPosition);
}
else if (buildChain)
{
// first time only - don't contain modified chain from UDL file
keychain = localKeychain = new NameValuePair(realkeyname, keyvalue, nextStartPosition - startPosition);
}
if (null != localKeychain)
{
localKeychain = localKeychain.Next = new NameValuePair(realkeyname, keyvalue, nextStartPosition - startPosition);
}
else if (buildChain)
{
// first time only - don't contain modified chain from UDL file
keychain = localKeychain = new NameValuePair(realkeyname, keyvalue, nextStartPosition - startPosition);
}
}
#if DEBUG
}
catch (ArgumentException e)
Expand Down
11 changes: 11 additions & 0 deletions src/libraries/System.Data.Common/tests/System/Data/Common/DbConnectionStringBuilderTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,17 @@ public void Add()
Assert.True(_builder.ContainsKey("Dsn"));
}

[Fact]
public void ConnectionString_EmptyValue_ParsedAsEmptyString()
{
_builder.ConnectionString = "Persist Security Info=";
Assert.False(_builder.ContainsKey("Persist Security Info"));

_builder.ConnectionString = "Persist Security Info=\"\"";
Assert.True(_builder.ContainsKey("Persist Security Info"));
Assert.Equal(string.Empty, _builder["Persist Security Info"]);
}

[Fact]
public void Add_Keyword_Invalid()
{
Expand Down
Loading