ls: Clamp overflowing size in --width to a max value

uutils · Jul 12, 2023 · 4ff1236 · 4ff1236
1 parent a1b4d25
commit 4ff1236
Showing 1 changed file with 14 additions and 2 deletions.
diff --git a/src/uu/ls/src/ls.rs b/src/uu/ls/src/ls.rs
@@ -800,12 +800,24 @@ impl Config {
                     // Read number as octal
                     match u16::from_str_radix(x, 8) {
                         Ok(v) => v,
-                        Err(_) => return Err(LsError::InvalidLineWidth(x.into()).into()),
+                        Err(err) => {
+                            // If number parsed is too large, clamp to maximum value
+                            match err.to_string() == "number too large to fit in target type" {
+                                true => u16::MAX,
+                                _ => return Err(LsError::InvalidLineWidth(x.into()).into()),
+                            }
+                        }
                     }
                 } else {
                     match x.parse::<u16>() {
                         Ok(u) => u,
-                        Err(_) => return Err(LsError::InvalidLineWidth(x.into()).into()),
+                        Err(err) => {
+                            // If number parsed is too large, clamp to maximum value
+                            match err.to_string() == "number too large to fit in target type" {
+                                true => u16::MAX,
+                                _ => return Err(LsError::InvalidLineWidth(x.into()).into()),
+                            }
+                        }
                     }
                 }
             }