diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 05:35:37 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-12 05:35:37 +0000 |
commit | a90a5cba08fdf6c0ceb95101c275108a152a3aed (patch) | |
tree | 532507288f3defd7f4dcf1af49698bcb76034855 /security/manager/ssl/crypto_hash/src/lib.rs | |
parent | Adding debian version 126.0.1-1. (diff) | |
download | firefox-a90a5cba08fdf6c0ceb95101c275108a152a3aed.tar.xz firefox-a90a5cba08fdf6c0ceb95101c275108a152a3aed.zip |
Merging upstream version 127.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'security/manager/ssl/crypto_hash/src/lib.rs')
-rw-r--r-- | security/manager/ssl/crypto_hash/src/lib.rs | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/security/manager/ssl/crypto_hash/src/lib.rs b/security/manager/ssl/crypto_hash/src/lib.rs index 9303f3cfd9..86690b4f84 100644 --- a/security/manager/ssl/crypto_hash/src/lib.rs +++ b/security/manager/ssl/crypto_hash/src/lib.rs @@ -103,11 +103,13 @@ impl CryptoHash { Some(digest) => digest, None => return Err(NS_ERROR_NOT_INITIALIZED), }; - // Safety: this is safe as long as xpcom gave us valid arguments. - let data = unsafe { - std::slice::from_raw_parts(data, len.try_into().map_err(|_| NS_ERROR_INVALID_ARG)?) - }; - digest.update(data); + if len > 0 { + // Safety: this is safe as long as xpcom gave us valid arguments. + let data = unsafe { + std::slice::from_raw_parts(data, len.try_into().map_err(|_| NS_ERROR_INVALID_ARG)?) + }; + digest.update(data); + } Ok(()) } @@ -120,14 +122,22 @@ impl CryptoHash { }; let mut available = 0u64; unsafe { stream.Available(&mut available as *mut u64).to_result()? }; - let mut to_read = if len == u32::MAX { available } else { len as u64 }; + let mut to_read = if len == u32::MAX { + available + } else { + len as u64 + }; if available == 0 || available < to_read { return Err(NS_ERROR_NOT_AVAILABLE); } let mut buf = vec![0u8; 4096]; let buf_len = buf.len() as u64; while to_read > 0 { - let chunk_len = if to_read >= buf_len { buf_len as u32 } else { to_read as u32 }; + let chunk_len = if to_read >= buf_len { + buf_len as u32 + } else { + to_read as u32 + }; let mut read = 0u32; unsafe { stream |