From f54fc2dcfe12bc71e9ac1446f2eb529bc7c5d3c7 Mon Sep 17 00:00:00 2001 From: Philippe Saint-Pierre Date: Mon, 2 Jan 2012 22:30:28 -0500 Subject: [PATCH] Terminal: NULL dereference fix An inversion in a condition could lead to a NULL dereference. CID 11039. --- src/apps/terminal/TermView.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/apps/terminal/TermView.cpp b/src/apps/terminal/TermView.cpp index bc87383bc5..e5aa246c59 100644 --- a/src/apps/terminal/TermView.cpp +++ b/src/apps/terminal/TermView.cpp @@ -615,7 +615,7 @@ TermView::_InitObject(const ShellParameters& shellParameters) const BCharacterSet* charset = BCharacterSetRoster::GetCharacterSetByConversionID(fEncoding); - modifiedShellParameters.SetEncoding(!charset ? charset->GetName() : "UTF-8"); + modifiedShellParameters.SetEncoding(charset ? charset->GetName() : "UTF-8"); error = fShell->Open(fRows, fColumns, modifiedShellParameters);