From 8446277c1116bd05cd99929f88b336cbcdd8846e Mon Sep 17 00:00:00 2001
From: Johnny Chen <johnny.chen@apple.com>
Date: Thu, 11 Aug 2011 19:12:10 +0000
Subject: [PATCH] Fix a logic error caught by the static analyzer.

llvm-svn: 137328
---
 lldb/source/Core/Scalar.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lldb/source/Core/Scalar.cpp b/lldb/source/Core/Scalar.cpp
index fb5769f55ffa..70be568d3e4e 100644
--- a/lldb/source/Core/Scalar.cpp
+++ b/lldb/source/Core/Scalar.cpp
@@ -1811,7 +1811,7 @@ Error
 Scalar::SetValueFromCString (const char *value_str, Encoding encoding, uint32_t byte_size)
 {
     Error error;
-    if (value_str == NULL && value_str[0] == '\0')
+    if (value_str == NULL || value_str[0] == '\0')
     {
         error.SetErrorString ("Invalid c-string value string.");
         return error;