Fixes

ispras · Nov 28, 2023 · 8fa5993 · 8fa5993
1 parent 7b4acc3
commit 8fa5993
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -184,13 +184,11 @@ Triage libFuzzer crashes with casr-libfuzzer:
 Triage Atheris crashes with casr-libfuzzer:
 
     $ unzip casr/tests/casr_tests/python/ruamel.zip
-    $ cp casr/tests/casr_tests/python/yaml_fuzzer.py .
-    $ casr-libfuzzer -i casr/tests/casr_tests/casrep/atheris_crashes_ruamel_yaml -o casr/tests/tmp_tests_casr/casr_libfuzzer_atheris_out -- ./yaml_fuzzer.py
+    $ casr-libfuzzer -i casr/tests/casr_tests/casrep/atheris_crashes_ruamel_yaml -o casr/tests/tmp_tests_casr/casr_libfuzzer_atheris_out -- casr/tests/casr_tests/python/yaml_fuzzer.py
 
 Triage Jazzer.js crashes with casr-libfuzzer:
     $ unzip casr/tests/casr_tests/js/crashes.zip -d crashes
-    $ cp casr/tests/casr_tests/js/test_casr_libfuzzer_jazzer_js.js .
-    $ casr-libfuzzer -i ./crashes -o casr/tests/tmp_tests_casr/casr_libfuzzer_jazzer_js_out -- npx jazzer ./test_casr_libfuzzer_jazzer_js.js
+    $ casr-libfuzzer -i ./crashes -o casr/tests/tmp_tests_casr/casr_libfuzzer_jazzer_js_out -- npx jazzer casr/tests/casr_tests/js/test_casr_libfuzzer_jazzer_js.js
 
 Upload new and unique CASR reports to
 [DefectDojo](https://github.com/DefectDojo/django-DefectDojo):

diff --git a/casr/src/bin/casr-js.rs b/casr/src/bin/casr-js.rs
@@ -12,7 +12,7 @@ use std::process::Command;
 fn main() -> Result<()> {
     let matches = clap::Command::new("casr-js")
         .version(clap::crate_version!())
-        .about("Create CASR reports (.casrep) from JS reports")
+        .about("Create CASR reports (.casrep) from JavaScript crash reports")
         .term_width(90)
         .arg(
             Arg::new("output")
@@ -71,7 +71,7 @@ fn main() -> Result<()> {
         )
         .get_matches();
 
-    init_ignored_frames!("js"); //TODO
+    init_ignored_frames!("js");
     if let Some(path) = matches.get_one::<PathBuf>("ignore") {
         util::add_custom_ignored_frames(path)?;
     }
@@ -135,7 +135,7 @@ fn main() -> Result<()> {
         report.js_report = js_stderr_list[start..].to_vec();
         report
             .js_report
-            .retain(|x| !x.is_empty() && (x.trim().starts_with("at") || x.contains("Error")));
+            .retain(|x| !x.is_empty() && (x.trim().starts_with("at") || x.contains("Error:")));
         let report_str = report.js_report.join("\n");
         report.stacktrace = JsStacktrace::extract_stacktrace(&report_str)?;
         if let Some(exception) = JsException::parse_exception(&report.js_report[0]) {

diff --git a/casr/tests/casr_tests/js/test_casr_js_jazzer.js b/casr/tests/casr_tests/js/test_casr_js_jazzer.js
@@ -15,4 +15,4 @@ function fuzz(data) {
 module.exports.fuzz = function (data /*: Buffer */) {
     const fuzzerData = data.toString();
     fuzz(fuzzerData);
-};
+};
diff --git a/casr/tests/casr_tests/js/test_casr_libfuzzer_jazzer_js.js b/casr/tests/casr_tests/js/test_casr_libfuzzer_jazzer_js.js
@@ -19,4 +19,4 @@ function fuzz(data) {
 module.exports.fuzz = function (data /*: Buffer */) {
     const fuzzerData = data.toString();
     fuzz(fuzzerData);
-};
+};
diff --git a/docs/usage.md b/docs/usage.md
@@ -543,13 +543,11 @@ binary with `casr-gdb`:
 Atheris example:
 
     $ unzip casr/tests/casr_tests/python/ruamel.zip
-    $ cp casr/tests/casr_tests/python/yaml_fuzzer.py .
-    $ casr-libfuzzer -i casr/tests/casr_tests/casrep/atheris_crashes_ruamel_yaml -o casr/tests/tmp_tests_casr/casr_libfuzzer_atheris_out -- ./yaml_fuzzer.py
+    $ casr-libfuzzer -i casr/tests/casr_tests/casrep/atheris_crashes_ruamel_yaml -o casr/tests/tmp_tests_casr/casr_libfuzzer_atheris_out -- casr/tests/casr_tests/python/yaml_fuzzer.py
 
 Jazzer.js example:
     $ unzip casr/tests/casr_tests/js/crashes.zip -d crashes
-    $ cp casr/tests/casr_tests/js/test_casr_libfuzzer_jazzer_js.js .
-    $ casr-libfuzzer -i ./crashes -o casr/tests/tmp_tests_casr/casr_libfuzzer_jazzer_js_out -- npx jazzer ./test_casr_libfuzzer_jazzer_js.js
+    $ casr-libfuzzer -i ./crashes -o casr/tests/tmp_tests_casr/casr_libfuzzer_jazzer_js_out -- npx jazzer casr/tests/casr_tests/js/test_casr_libfuzzer_jazzer_js.js
 
 You can set environment variable `RUST_BACKTRACE=(1|full)` for `casr-libfuzzer`. This
 variable may be used by [casr-san](#casr-san).