Skip to content

Commit dd25c6d

Browse files
authored
Update to mupdf v1.26.0-rc1 and fix leak (#135)
* Update to mupdf v1.26.0-rc1 * Prevent font buffer from being leaked * Make llvm-symbolizer available in ASAN CI * Compile fontconfig in ASAN CI * Revert "Compile fontconfig in ASAN CI" This reverts commit 6579d8d. * Ignore Fc in LSAN
1 parent 2425c14 commit dd25c6d

File tree

5 files changed

+8
-5
lines changed

5 files changed

+8
-5
lines changed

.github/workflows/CI.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,13 +95,13 @@ jobs:
9595
- uses: dtolnay/rust-toolchain@nightly
9696
with:
9797
components: rust-src
98-
- run: sudo apt-get -y install libfontconfig1-dev
98+
- run: sudo apt-get -y install libfontconfig1-dev llvm
9999
- name: cargo test --features serde
100100
run: |
101101
cargo test -Zbuild-std --target x86_64-unknown-linux-gnu --features serde
102102
env:
103103
RUSTFLAGS: -Zsanitizer=address
104-
LSAN_OPTIONS: report_objects=1
104+
LSAN_OPTIONS: report_objects=1:suppressions=lsan_suppressions.txt
105105

106106
valgrind:
107107
name: Valgrind

lsan_suppressions.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# fontconfig
2+
leak:Fc

mupdf-sys/mupdf

Submodule mupdf updated 288 files

src/font.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ impl Font {
8080
context(),
8181
c_name.as_ptr(),
8282
index,
83-
buffer.into_inner()
83+
buffer.inner
8484
))
8585
}
8686
.map(|inner| Self { inner })

src/stroke_state.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,9 @@ impl StrokeState {
122122
pub fn dashes(&self) -> Vec<f32> {
123123
unsafe {
124124
let dash_len = (*self.inner).dash_len as usize;
125+
let dash_ptr = (*self.inner).dash_list.as_ptr();
125126
let mut dash_list = Vec::with_capacity(dash_len);
126-
dash_list.extend_from_slice(&(*self.inner).dash_list[0..dash_len]);
127+
dash_list.extend_from_slice(std::slice::from_raw_parts(dash_ptr, dash_len));
127128
dash_list
128129
}
129130
}

0 commit comments

Comments
 (0)