Fix panic of 'pastel distinct N' for N < 2, closes #69

sharkdp · Aug 25, 2019 · 704f335 · 704f335
1 parent 556ed98
commit 704f335
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/src/cli/commands/distinct.rs b/src/cli/commands/distinct.rs
@@ -67,6 +67,10 @@ impl GenericCommand for DistinctCommand {
             .parse::<usize>()
             .map_err(|_| PastelError::CouldNotParseNumber(count.into()))?;
 
+        if count < 2 {
+            return Err(PastelError::DistinctColorCountMustBeLargerThanOne);
+        }
+
         let distance_metric = match matches.value_of("metric").expect("required argument") {
             "CIE76" => DistanceMetric::CIE76,
             "CIEDE2000" => DistanceMetric::CIEDE2000,

diff --git a/src/cli/error.rs b/src/cli/error.rs
@@ -8,6 +8,7 @@ pub enum PastelError {
     CouldNotParseNumber(String),
     StdoutClosed,
     GradientNumberMustBeLargerThanOne,
+    DistinctColorCountMustBeLargerThanOne,
     ColorPickerExecutionError(String),
     NoColorPickerFound,
     IoError(std::io::Error),
@@ -34,6 +35,9 @@ impl PastelError {
             PastelError::GradientNumberMustBeLargerThanOne => {
                 "The number of colors must be larger one".into()
             }
+            PastelError::DistinctColorCountMustBeLargerThanOne => {
+                "The number of colors must be larger one".into()
+            }
             PastelError::ColorPickerExecutionError(name) => {
                 format!("Error while running color picker '{}", name)
             }