diff options
Diffstat (limited to 'chrome/browser/enumerate_modules_model_win.cc')
-rw-r--r-- | chrome/browser/enumerate_modules_model_win.cc | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/chrome/browser/enumerate_modules_model_win.cc b/chrome/browser/enumerate_modules_model_win.cc index 95b24d4..699c003e 100644 --- a/chrome/browser/enumerate_modules_model_win.cc +++ b/chrome/browser/enumerate_modules_model_win.cc @@ -341,20 +341,17 @@ ModuleEnumerator::ModuleStatus ModuleEnumerator::Match( location_hash == blacklisted.location)) { // We have a name match against the blacklist (and possibly location match // also), so check version. - scoped_ptr<Version> module_version( - Version::GetVersionFromString(UTF16ToASCII(module.version))); - scoped_ptr<Version> version_min( - Version::GetVersionFromString(blacklisted.version_from)); - scoped_ptr<Version> version_max( - Version::GetVersionFromString(blacklisted.version_to)); - bool version_ok = !version_min.get() && !version_max.get(); + Version module_version(UTF16ToASCII(module.version)); + Version version_min(blacklisted.version_from); + Version version_max(blacklisted.version_to); + bool version_ok = !version_min.IsValid() && !version_max.IsValid(); if (!version_ok) { - bool too_low = version_min.get() && - (!module_version.get() || - module_version->CompareTo(*version_min.get()) < 0); - bool too_high = version_max.get() && - (!module_version.get() || - module_version->CompareTo(*version_max.get()) >= 0); + bool too_low = version_min.IsValid() && + (!module_version.IsValid() || + module_version.CompareTo(version_min) < 0); + bool too_high = version_max.IsValid() && + (!module_version.IsValid() || + module_version.CompareTo(version_max) >= 0); version_ok = !too_low && !too_high; } |