From 7df8b75567c4e3ced71b71f9d0779e8f5c1f2254 Mon Sep 17 00:00:00 2001 From: Mattt Date: Tue, 10 May 2022 11:35:24 -0700 Subject: [PATCH 1/2] Add early returns when version string is invalid --- .../npm_and_yarn/update_checker/version_resolver.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/npm_and_yarn/lib/dependabot/npm_and_yarn/update_checker/version_resolver.rb b/npm_and_yarn/lib/dependabot/npm_and_yarn/update_checker/version_resolver.rb index 11cea3bea42..7681054ce74 100644 --- a/npm_and_yarn/lib/dependabot/npm_and_yarn/update_checker/version_resolver.rb +++ b/npm_and_yarn/lib/dependabot/npm_and_yarn/update_checker/version_resolver.rb @@ -252,7 +252,9 @@ def types_update_available? return false unless latest_allowable_version.backwards_compatible_with?(latest_types_package_version) + return false unless version_class.correct?(types_package.version) current_types_package_version = version_class.new(types_package.version) + return false unless current_types_package_version < latest_types_package_version true @@ -261,9 +263,11 @@ def types_update_available? def original_package_update_available? return false if original_package.nil? - latest_version = latest_version_finder(original_package).latest_version_from_registry + return false unless version_class.correct?(original_package.version) original_package_version = version_class.new(original_package.version) + latest_version = latest_version_finder(original_package).latest_version_from_registry + original_package_version < latest_version end From 0d50dbc783c66204f94e025db46cbdd5a75e49ed Mon Sep 17 00:00:00 2001 From: Mattt Date: Tue, 10 May 2022 11:46:48 -0700 Subject: [PATCH 2/2] Formatting --- .../dependabot/npm_and_yarn/update_checker/version_resolver.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/npm_and_yarn/lib/dependabot/npm_and_yarn/update_checker/version_resolver.rb b/npm_and_yarn/lib/dependabot/npm_and_yarn/update_checker/version_resolver.rb index 7681054ce74..81318254768 100644 --- a/npm_and_yarn/lib/dependabot/npm_and_yarn/update_checker/version_resolver.rb +++ b/npm_and_yarn/lib/dependabot/npm_and_yarn/update_checker/version_resolver.rb @@ -253,6 +253,7 @@ def types_update_available? return false unless latest_allowable_version.backwards_compatible_with?(latest_types_package_version) return false unless version_class.correct?(types_package.version) + current_types_package_version = version_class.new(types_package.version) return false unless current_types_package_version < latest_types_package_version @@ -264,6 +265,7 @@ def original_package_update_available? return false if original_package.nil? return false unless version_class.correct?(original_package.version) + original_package_version = version_class.new(original_package.version) latest_version = latest_version_finder(original_package).latest_version_from_registry