Preprocessing version number for plugins to ignore leading zeros during comparisons. This eliminate…

webkit/plugins/npapi/plugin_group.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <algorithm>
 
 #include "webkit/plugins/npapi/plugin_group.h"
 
 #include "base/memory/linked_ptr.h"
+#include "base/string_split.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "base/version.h"
 #include "webkit/plugins/npapi/plugin_list.h"
 #include "webkit/plugins/webplugininfo.h"
 
 namespace webkit {
 namespace npapi {
@@ skipping 73 matching lines @@
 
   // Look for the name matcher anywhere in the plugin name.
   if (plugin.name.find(name_matcher_) == string16::npos) {
     return false;
   }
 
   return true;
 }
 
 /* static */
+std::string PluginGroup::RemoveLeadingZerosFromVersionComponents(
+    const std::string& version) {
+  std::string no_leading_zeros_version = "";

[Bernhard Bauer, 2012/08/13 11:25:43]

Nit: The default constructor for std::string already is an empty string.

[ibraaaa, 2012/08/13 12:26:45]

Done.

+  std::vector<std::string> numbers;
+  base::SplitString(version, '.', &numbers);
+  for (size_t i = 0; i < numbers.size(); ++i) {
+    size_t n = numbers[i].size();
+    size_t j = 0;
+    while (j < n && numbers[i][j] == '0') {
+      ++j;
+    }
+    no_leading_zeros_version += (j < n) ? numbers[i].substr(j) : "0";

[Bernhard Bauer, 2012/08/13 11:25:43]

I think this slightly changes the behavior for empty version components: 1..0
with two dots would now be normalized to 1.0.0, whereas it would be rejected in
the old version. I think I'm okay with that, but we might want to ratify that
behavior via a unit test.

[ibraaaa, 2012/08/13 12:26:45]

Done.

+    if (i != numbers.size() - 1) {
+      no_leading_zeros_version += ".";
+    }
+  }
+
+  return no_leading_zeros_version;
+}
+
+/* static */
 void PluginGroup::CreateVersionFromString(const string16& version_string,
                                           Version* parsed_version) {
   // Remove spaces and ')' from the version string,
   // Replace any instances of 'r', ',' or '(' with a dot.
   std::string version = UTF16ToASCII(version_string);
   RemoveChars(version, ") ", &version);
   std::replace(version.begin(), version.end(), 'd', '.');
   std::replace(version.begin(), version.end(), 'r', '.');
   std::replace(version.begin(), version.end(), ',', '.');
   std::replace(version.begin(), version.end(), '(', '.');
   std::replace(version.begin(), version.end(), '_', '.');
 
+  // Remove leading zeros from each of the version components.
+  version = RemoveLeadingZerosFromVersionComponents(version);
+
   *parsed_version = Version(version);
 }
 
 void PluginGroup::AddPlugin(const WebPluginInfo& plugin) {
   // Check if this group already contains this plugin.
   for (size_t i = 0; i < web_plugin_infos_.size(); ++i) {
     if (FilePath::CompareEqualIgnoreCase(web_plugin_infos_[i].path.value(),
                                          plugin.path.value())) {
       return;
     }
@@ skipping 34 matching lines @@
   }
   return false;
 }
 
 bool PluginGroup::IsEmpty() const {
   return web_plugin_infos_.empty();
 }
 
 }  // namespace npapi
 }  // namespace webkit