commit 124260d94f06c7fd6afa270acc2dc610fc6b28dd
author munjal@chromium.org <munjal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Fri Jul 24 06:34:40 2009 +0900
committer Qijiang Fan <fqj@google.com> Thu Jun 04 09:45:10 2020 +0900
tree f89388d55ab5ab8ab1e776691d02166905c8fa88
parent c4e2a31837e54820187918b95f4f078a03e1cfe1

Silence a false coverity warning by changing the code a bit.

Review URL: http://codereview.chromium.org/159104

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21447 0039d316-1c4b-4281-b951-d872f2087c98


CrOS-Libchrome-Original-Commit: 5b0bc2527811d672c7b09a2a4fbfa92b49132186

base/json_reader.cc

diff --git a/base/json_reader.cc b/base/json_reader.cc
index fd11a18..2c3ab0b 100644
--- a/base/json_reader.cc
+++ b/base/json_reader.cc
@@ -601,15 +601,11 @@
     // Block comment, read until */
     json_pos_ += 2;
     while ('\0' != *json_pos_) {
-      switch (*json_pos_) {
-        case '*':
-          if ('/' == *(json_pos_ + 1)) {
-            json_pos_ += 2;
-            return true;
-          }
-        default:
-          ++json_pos_;
+      if ('*' == *json_pos_ && '/' == *(json_pos_ + 1)) {
+        json_pos_ += 2;
+        return true;
       }
+      ++json_pos_;
     }
   } else {
     return false;

base/json_reader_unittest.cc

diff --git a/base/json_reader_unittest.cc b/base/json_reader_unittest.cc
index 0513eb5..be3e07e 100644
--- a/base/json_reader_unittest.cc
+++ b/base/json_reader_unittest.cc
@@ -24,6 +24,24 @@
   ASSERT_TRUE(root.get());
   ASSERT_TRUE(root->IsType(Value::TYPE_BOOLEAN));
 
+  // Embedded comment
+  root.reset(JSONReader().JsonToValue("/* comment */null", false, false));
+  ASSERT_TRUE(root.get());
+  ASSERT_TRUE(root->IsType(Value::TYPE_NULL));
+  root.reset(JSONReader().JsonToValue("40 /* comment */", false, false));
+  ASSERT_TRUE(root.get());
+  ASSERT_TRUE(root->IsType(Value::TYPE_INTEGER));
+  root.reset(JSONReader().JsonToValue("true // comment", false, false));
+  ASSERT_TRUE(root.get());
+  ASSERT_TRUE(root->IsType(Value::TYPE_BOOLEAN));
+  root.reset(JSONReader().JsonToValue("/* comment */\"sample string\"",
+                                      false, false));
+  ASSERT_TRUE(root.get());
+  ASSERT_TRUE(root->IsType(Value::TYPE_STRING));
+  std::string value;
+  ASSERT_TRUE(root->GetAsString(&value));
+  ASSERT_EQ("sample string", value);
+
   // Test number formats
   root.reset(JSONReader().JsonToValue("43", false, false));
   ASSERT_TRUE(root.get());