Merge branch 'master' into fix-newlines

.github/workflows/CICD.yml

@@ -41,6 +41,24 @@ jobs:
           command: test
           args: --all-features
 
+  fuzz:
+    name: Test Suite
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout sources
+        uses: actions/checkout@v2
+
+      - name: Install cargo-fuzz
+        uses: taiki-e/install-action@v2
+        with:
+          tool: cargo-fuzz
+
+      - name: Nightly
+        run: rustup default nightly
+
+      - name: Run Fuzzer
+        run: cargo +nightly fuzz run ical -- -max_total_time=10
+
   lints:
     name: Lints
     runs-on: ubuntu-latest

Cargo.toml

@@ -9,7 +9,7 @@ license-file = "./LICENSE"
 name = "ical"
 readme = "./README.md"
 repository = "https://github.com/Peltoche/ical-rs"
-version = "0.7.0"
+version = "0.9.0"
 
 [badges]
 
@@ -18,8 +18,8 @@ branch = "master"
 repository = "https://travis-ci.org/Peltoche/ical-rs"
 
 [dependencies]
-thiserror = "1.0.38"
-serde = { version = "1.0.152", features = ["derive"], optional = true }
+thiserror = "1.0.50"
+serde = { version = "1.0.193", features = ["derive"], optional = true }
 
 [features]
 default = ["vcard", "ical"]

README.md

@@ -21,7 +21,7 @@ Put this in your `Cargo.toml`:
 
 ```toml
 [dependencies]
-ical = "0.7.*"
+ical = "0.9"
 ```
 
 
@@ -49,7 +49,7 @@ Each component can contains properties (ie: `Property`) or sub-components.
 Cargo.toml:
 ```toml
 [dependencies.ical]
-version = "0.7.*"
+version = "0.9"
 default-features = false
 features = ["ical", "vcard"]
 ```
@@ -112,7 +112,7 @@ It work for both the vCard and iCal formats.
 Cargo.toml:
 ```toml
 [dependencies.ical]
-version = "0.7.*"
+version = "0.9"
 default-features = false
 features = ["property"]
 ```
@@ -155,7 +155,7 @@ It work for both the vCard and iCal formats.
 Cargo.toml:
 ```toml
 [dependencies.ical]
-version = "0.7.*"
+version = "0.9"
 default-features = false
 features = ["line"]
 ```
@@ -202,7 +202,7 @@ formalities.
 Cargo.toml:
 ```toml
 [dependencies.ical]
-version = "0.7.*"
+version = "0.9"
 default-features = false
 features = ["ical", "vcard", "generator"]
 ```

fuzz/.gitignore

@@ -0,0 +1,4 @@
+target
+corpus
+artifacts
+coverage

fuzz/Cargo.toml

@@ -0,0 +1,26 @@
+[package]
+name = "ical-fuzz"
+version = "0.0.0"
+publish = false
+
+[package.metadata]
+cargo-fuzz = true
+
+[dependencies]
+libfuzzer-sys = "0.4"
+
+[dependencies.ical]
+path = ".."
+
+# Prevent this from interfering with workspaces
+[workspace]
+members = ["."]
+
+[profile.release]
+debug = 1
+
+[[bin]]
+name = "ical"
+path = "fuzz_targets/ical.rs"
+test = false
+doc = false

fuzz/fuzz_targets/ical.rs

@@ -0,0 +1,12 @@
+#![no_main]
+
+extern crate libfuzzer_sys;
+extern crate ical;
+
+
+use libfuzzer_sys::fuzz_target;
+
+fuzz_target!(|data: &[u8]| {
+     let c = std::io::Cursor::new(data);
+    for _ in ical::IcalParser::new(c) {} 
+});

src/line.rs

@@ -118,7 +118,7 @@ impl<B: BufRead> LineRead for LineReader<B> {
         } else {
             // This is the first iteration, next_start isn't been filled yet.
             for line in self.reader.by_ref().lines() {
-                let line = line.unwrap();
+                let line = line.ok()?;
                 self.number += 1;
 
                 if !line.is_empty() {
@@ -130,7 +130,7 @@ impl<B: BufRead> LineRead for LineReader<B> {
         }
 
         for line in self.reader.by_ref().lines() {
-            let mut line = line.unwrap();
+            let mut line = line.ok()?;
 
             if line.is_empty() {
                 self.number += 1;