Skip to content

Commit d53503b

Browse files
authored
Fix stb image on windows (#1657)
* fix * fix * HOW DO I ADD FROM:FROM???? * ok
1 parent c97d0fa commit d53503b

File tree

16 files changed

+19
-4
lines changed

16 files changed

+19
-4
lines changed

.github/workflows/build_and_test.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -365,6 +365,8 @@ jobs:
365365
- uses: ilammy/msvc-dev-cmd@v1
366366
- name: install cxx bridge
367367
run: cargo install cxxbridge-cmd
368+
- name: Build fuzzers/libfuzzer_stb_image
369+
run: cd fuzzers/libfuzzer_stb_image && cargo build --release
368370
- name: Build fuzzers/frida_libpng
369371
run: cd fuzzers/frida_libpng/ && cargo make test
370372
- name: Build fuzzers/frida_gdiplus

fuzzers/libfuzzer_stb_image/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ debug = true
1818
[dependencies]
1919
libafl = { path = "../../libafl/" }
2020
libafl_bolts = { path = "../../libafl_bolts/" }
21-
libafl_targets = { path = "../../libafl_targets/", features = ["sancov_pcguard_edges", "sancov_cmplog", "libfuzzer"] }
21+
libafl_targets = { path = "../../libafl_targets/", features = ["sancov_pcguard_edges", "sancov_cmplog", "libfuzzer", "libfuzzer_no_link_main"] }
2222
mimalloc = { version = "*", default-features = false }
2323

2424
[build-dependencies]

libafl/src/corpus/cached.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -251,6 +251,7 @@ where
251251

252252
/// ``CachedOnDiskCorpus`` Python bindings
253253
#[cfg(feature = "python")]
254+
#[allow(clippy::unnecessary_fallible_conversions)]
254255
pub mod pybind {
255256
use alloc::string::String;
256257
use std::path::PathBuf;

libafl/src/corpus/inmemory.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -429,6 +429,7 @@ where
429429

430430
/// `InMemoryCorpus` Python bindings
431431
#[cfg(feature = "python")]
432+
#[allow(clippy::unnecessary_fallible_conversions)]
432433
pub mod pybind {
433434
use pyo3::prelude::*;
434435
use serde::{Deserialize, Serialize};

libafl/src/corpus/inmemory_ondisk.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -439,6 +439,7 @@ where
439439
}
440440

441441
#[cfg(feature = "python")]
442+
#[allow(clippy::unnecessary_fallible_conversions)]
442443
/// `InMemoryOnDiskCorpus` Python bindings
443444
pub mod pybind {
444445
use alloc::string::String;

libafl/src/corpus/ondisk.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -262,6 +262,7 @@ where
262262
}
263263

264264
#[cfg(feature = "python")]
265+
#[allow(clippy::unnecessary_fallible_conversions)]
265266
/// `OnDiskCorpus` Python bindings
266267
pub mod pybind {
267268
use alloc::string::String;

libafl/src/events/simple.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -579,6 +579,7 @@ where
579579
/// `SimpleEventManager` Python bindings
580580
#[cfg(feature = "python")]
581581
#[allow(missing_docs)]
582+
#[allow(clippy::unnecessary_fallible_conversions)]
582583
pub mod pybind {
583584
use pyo3::prelude::*;
584585

libafl/src/executors/inprocess.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2214,6 +2214,7 @@ mod tests {
22142214

22152215
#[cfg(feature = "python")]
22162216
#[allow(missing_docs)]
2217+
#[allow(clippy::unnecessary_fallible_conversions)]
22172218
/// `InProcess` Python bindings
22182219
pub mod pybind {
22192220
use alloc::boxed::Box;

libafl/src/feedbacks/mod.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1095,6 +1095,7 @@ impl From<bool> for ConstFeedback {
10951095

10961096
/// `Feedback` Python bindings
10971097
#[cfg(feature = "python")]
1098+
#[allow(clippy::unnecessary_fallible_conversions)]
10981099
#[allow(missing_docs)]
10991100
pub mod pybind {
11001101
use std::cell::UnsafeCell;

libafl/src/generators/mod.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,7 @@ where
170170
/// `Generator` Python bindings
171171
#[allow(missing_docs)]
172172
#[cfg(feature = "python")]
173+
#[allow(clippy::unnecessary_fallible_conversions)]
173174
pub mod pybind {
174175
use alloc::vec::Vec;
175176

0 commit comments

Comments
 (0)