Skip to content

Commit e9f73bf

Browse files
committed
Merge branch 'stable' into beta
2 parents 01e6970 + 045b8c2 commit e9f73bf

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

CHANGELOG.md

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ The table below shows which release corresponds to each branch, and what date th
1111
| ---------------- | -------- | ---------------------- |
1212
| [4.13.0](#4130-dev) | `dev` |
1313
| [4.12.0](#4120-beta) | `beta` |
14-
| [4.11.0](#4110-stable) | `stable` | Sep 15, 2023
14+
| [4.11.1](#4111-stable) | `stable` |
15+
| [4.11.0](#4110) | | Sep 15, 2023
1516
| [4.10.0](#4100) | | May 21, 2023
1617
| [4.9.0](#490) | | Dec 29, 2022
1718
| [4.8.0](#480) | | Apr 21, 2022
@@ -88,7 +89,13 @@ The table below shows which release corresponds to each branch, and what date th
8889
[2257]: https://github.com/Gallopsled/pwntools/pull/2257
8990
[2225]: https://github.com/Gallopsled/pwntools/pull/2225
9091

91-
## 4.11.0 (`stable`)
92+
## 4.11.1 (`stable`)
93+
94+
- [#2281][2281] FIX: Getting right amount of data for search fix
95+
96+
[2281]: https://github.com/Gallopsled/pwntools/pull/2281
97+
98+
## 4.11.0
9299

93100
- [#2185][2185] make fmtstr module able to create payload without $ notation
94101
- [#2103][2103] Add search for libc binary by leaked function addresses `libcdb.search_by_symbol_offsets()`

pwnlib/elf/elf.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1195,9 +1195,10 @@ def search(self, needle, writable = False, executable = False):
11951195
for seg in segments:
11961196
addr = seg.header.p_vaddr
11971197
memsz = seg.header.p_memsz
1198-
zeroed = memsz - seg.header.p_filesz
1198+
filesz = seg.header.p_filesz
1199+
zeroed = memsz - filesz
11991200
offset = seg.header.p_offset
1200-
data = self.mmap[offset:offset+memsz]
1201+
data = self.mmap[offset:offset+filesz]
12011202
data += b'\x00' * zeroed
12021203
offset = 0
12031204
while True:

0 commit comments

Comments
 (0)