pmeunier/elpe - Change FRNJITN6RQ2HFEEQX6EKZVZ7PYT2JAIGZX5J25LIVLPV7OLUNYFQC

Elfedit: Error instead of assert when there is no section table

Created by pmeunier on May 8, 2025

FRNJITN6RQ2HFEEQX6EKZVZ7PYT2JAIGZX5J25LIVLPV7OLUNYFQC

Dependencies

In channels

main

Change contents

Insertion in elfedit/src/lib.rs at line 84 [4.69]
[3.57]
[4.2912]
```
    #[error("No section table")]
    NoSectionTable,
```

Replacement in elfedit/src/lib.rs at line 557 [4.69]

∅:D[5.5179] → [4.11302:11383]

B:BD[4.11302] → [4.11302:11383]

        let map = unsafe { memmap::MmapOptions::new().map_mut(&file).unwrap() };

[5.5179]

[5.5180]

        let map = unsafe { memmap::MmapOptions::new().map_mut(&file)? };

Replacement in elfedit/src/lib.rs at line 628 [4.69]

B:BD[6.3198] → [6.3198:3244]

            let s = self.section(i as usize);

[6.3198]

[6.3244]

            let s = self.section(i as usize).unwrap();

Replacement in elfedit/src/lib.rs at line 631 [4.69]

B:BD[6.3323] → [6.3323:3372]

            let names = self.names(id.data, &h);

[6.3323]

[6.3372]

            let names = self.names(id.data, &h).unwrap();

Replacement in elfedit/src/lib.rs at line 697 [4.69]

B:BD[4.11565] → [4.11565:11628]

    fn section<'a>(&'a self, n: usize) -> SectionHeader_<'a> {

[4.11565]

[4.11628]

    fn section<'a>(&'a self, n: usize) -> Result<SectionHeader_<'a>, Error> {

Replacement in elfedit/src/lib.rs at line 704 [4.69]

B:BD[4.11856] → [4.11856:11947]

                assert!(ph + std::mem::size_of::<SectionHeader<u32>>() <= self.map.len());

[4.11856]

[4.11947]

                if ph + std::mem::size_of::<SectionHeader<u32>>() > self.map.len() {
                    return Err(Error::NoSectionTable)
                }

Replacement in elfedit/src/lib.rs at line 708 [4.69]

B:BD[4.12027] → [4.12027:12072]

                SectionHeader_::B32(unsafe {

[4.12027]

[4.12072]

                Ok(SectionHeader_::B32(unsafe {

Replacement in elfedit/src/lib.rs at line 710 [4.69]
B:BD[4.12166] → [4.12166:12185]
```
                })
```
[4.12166]
[4.12185]
```
                }))
```

Replacement in elfedit/src/lib.rs at line 713 [4.69]

B:BD[4.12232] → [4.12232:12323]

                assert!(ph + std::mem::size_of::<SectionHeader<u64>>() <= self.map.len());

[4.12232]

[4.12323]

                if ph + std::mem::size_of::<SectionHeader<u64>>() > self.map.len() {
                    return Err(Error::NoSectionTable)
                }

Replacement in elfedit/src/lib.rs at line 717 [4.69]

B:BD[4.12403] → [4.12403:12448]

                SectionHeader_::B64(unsafe {

[4.12403]

[4.12448]

                Ok(SectionHeader_::B64(unsafe {

Replacement in elfedit/src/lib.rs at line 719 [4.69]
B:BD[4.12542] → [4.12542:12561]
```
                })
```
[4.12542]
[4.12561]
```
                }))
```

Replacement in elfedit/src/lib.rs at line 814 [4.69]

B:BD[4.15411] → [4.15411:15487]

B:BD[4.15487] → [4.15487:15547]

    fn names<'a>(&'a self, id: Endianness, header: &Header_) -> Names<'a> {
        let s = self.section(header.shstrndx(id) as usize);

[4.15411]

[4.15547]

    fn names<'a>(&'a self, id: Endianness, header: &Header_) -> Result<Names<'a>, Error> {
        let s = self.section(header.shstrndx(id) as usize)?;

Replacement in elfedit/src/lib.rs at line 818 [4.69]

B:BD[4.15631] → [4.15631:15679]

        Names(&self.map[offset..offset + size])

[4.15631]

[4.15679]

        Ok(Names(&self.map[offset..offset + size]))

Replacement in elfedit/src/lib.rs at line 894 [4.69]

B:BD[4.18403] → [4.18403:18453]

        let names = self.names(id.data, &header);

[4.18403]

[4.18453]

        let names = match self.names(id.data, &header) {
            Ok(names) => names,
            Err(Error::NoSectionTable) => {
                return Ok(None)
            },
            Err(e) => return Err(e)
        };

Replacement in elfedit/src/lib.rs at line 905 [4.69]

B:BD[4.18617] → [4.18617:18663]

            let s = self.section(i as usize);

[4.18617]

[4.18663]

            let s = self.section(i as usize)?;

Replacement in elfedit/src/lib.rs at line 943 [4.69]

B:BD[3.1516] → [3.1516:1566]

        let names = self.names(id.data, &header);

[3.1516]

[3.1566]

        let names = self.names(id.data, &header)?;

Replacement in elfedit/src/lib.rs at line 945 [4.69]

B:BD[3.1610] → [3.1610:1656]

            let s = self.section(i as usize);

[3.1610]

[3.1656]

            let s = self.section(i as usize)?;

Replacement in elfedit/src/lib.rs at line 959 [4.69]

B:BD[4.20724] → [4.20724:20769]

        let names = self.names(id, &header);

[4.20724]

[4.20769]

        let names = self.names(id, &header)?;

Replacement in elfedit/src/lib.rs at line 1005 [4.69]

B:BD[4.22076] → [4.22076:22138]

        let off = self.section(interp_i as usize).offset(id);

[4.22076]

[4.22138]

        let off = self.section(interp_i as usize)?.offset(id);

Replacement in elfedit/src/lib.rs at line 1016 [4.69]

B:BD[4.22418] → [4.22418:22484]

            let off = self.section(interp_i as usize).offset(id);

[4.22418]

[4.22484]

            let off = self.section(interp_i as usize)?.offset(id);

Replacement in elfedit/src/lib.rs at line 1042 [4.69]

B:BD[5.6451] → [5.6451:6503]

                let sh = self.section(p_ as usize);

[5.6451]

[2.0]

                let sh = self.section(p_ as usize).unwrap();

Replacement in elfedit/src/lib.rs at line 1477 [4.69]

B:BD[5.16600] → [2.2446:2499]

                    elf.update_dynamic::<u32>(id, t)

[5.16600]

[5.16654]

                    elf.update_dynamic::<u32>(id, t)?

Replacement in elfedit/src/lib.rs at line 1482 [4.69]

B:BD[5.16772] → [2.2500:2553]

                    elf.update_dynamic::<u64>(id, t)

[5.16772]

[5.16826]

                    elf.update_dynamic::<u64>(id, t)?

Replacement in elfedit/src/lib.rs at line 1492 [4.69]

B:BD[4.30512] → [5.17002:17075]

    fn update_dynamic<F: Flags>(&self, id: Endianness, f: &mut F::Dyn) {

[4.30512]

[5.17075]

    fn update_dynamic<F: Flags>(&self, id: Endianness, f: &mut F::Dyn) -> Result<(), Error> {

Replacement in elfedit/src/lib.rs at line 1495 [4.69]
B:BD[5.17195] → [5.17195:17234]
```
            let sec = self.section(s);
```
[5.17195]
[5.17234]
```
            let sec = self.section(s)?;
```
Replacement in elfedit/src/lib.rs at line 1499 [4.69]
B:BD[5.17414] → [5.17414:17453]
```
            let sec = self.section(s);
```
[5.17414]
[5.17453]
```
            let sec = self.section(s)?;
```

Replacement in elfedit/src/lib.rs at line 1503 [4.69]

B:BD[3.5234] → [3.5234:5273]

            let sec = self.section(s);

[3.5234]

[3.5273]

            let sec = self.section(s)?;

Insertion in elfedit/src/lib.rs at line 1506 [4.69]
[5.17517]
[5.17517]
```
        Ok(())
```