Patchwork D9107: hg-core: return Err if `offset != bytes.len()` (D8958#inline-14994 followup 2/2)

login
register
mail settings
Submitter phabricator
Date Sept. 28, 2020, 1:49 p.m.
Message ID <differential-rev-PHID-DREV-xngvasxa4hauubmwh4dk-req@mercurial-scm.org>
Download mbox | patch
Permalink /patch/47322/
State Superseded
Headers show

Comments

phabricator - Sept. 28, 2020, 1:49 p.m.
acezar created this revision.
Herald added a reviewer: hg-reviewers.
Herald added a subscriber: mercurial-patches.

REVISION SUMMARY
  [X] make `Index` owner of its bytes
  [X] make `Index::new` return an error if `offset != bytes.len()`

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D9107

AFFECTED FILES
  rust/hg-core/src/revlog/index.rs
  rust/hg-core/src/revlog/revlog.rs

CHANGE DETAILS




To: acezar, #hg-reviewers
Cc: mercurial-patches, mercurial-devel

Patch

diff --git a/rust/hg-core/src/revlog/revlog.rs b/rust/hg-core/src/revlog/revlog.rs
--- a/rust/hg-core/src/revlog/revlog.rs
+++ b/rust/hg-core/src/revlog/revlog.rs
@@ -56,7 +56,7 @@ 
             return Err(RevlogError::UnsuportedVersion(version));
         }
 
-        let index = Index::new(Box::new(index_mmap));
+        let index = Index::new(Box::new(index_mmap))?;
 
         // TODO load data only when needed //
         // type annotation required
diff --git a/rust/hg-core/src/revlog/index.rs b/rust/hg-core/src/revlog/index.rs
--- a/rust/hg-core/src/revlog/index.rs
+++ b/rust/hg-core/src/revlog/index.rs
@@ -2,6 +2,7 @@ 
 
 use byteorder::{BigEndian, ByteOrder};
 
+use crate::revlog::revlog::RevlogError;
 use crate::revlog::{Revision, NULL_REVISION};
 
 pub const INDEX_ENTRY_SIZE: usize = 64;
@@ -17,7 +18,9 @@ 
 impl Index {
     /// Create an index from bytes.
     /// Calculate the start of each entry when is_inline is true.
-    pub fn new(bytes: Box<dyn Deref<Target = [u8]> + Send>) -> Self {
+    pub fn new(
+        bytes: Box<dyn Deref<Target = [u8]> + Send>,
+    ) -> Result<Self, RevlogError> {
         if is_inline(&bytes) {
             let mut offset: usize = 0;
             let mut offsets = Vec::new();
@@ -33,15 +36,19 @@ 
                 offset += INDEX_ENTRY_SIZE + entry.compressed_len();
             }
 
-            Self {
-                bytes,
-                offsets: Some(offsets),
+            if offset == bytes.len() {
+                Ok(Self {
+                    bytes,
+                    offsets: Some(offsets),
+                })
+            } else {
+                Err(RevlogError::Corrupted)
             }
         } else {
-            Self {
+            Ok(Self {
                 bytes,
                 offsets: None,
-            }
+            })
         }
     }