Skip to content

argv and env in elf loader should be able to accept bytes as argument #951

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xwings merged 1 commit into from
Oct 20, 2021
Merged

argv and env in elf loader should be able to accept bytes as argument #951

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions qiling/loader/elf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@ def __push_str(top: int, s: str) -> int:
Top of stack remains aligned to pointer size
"""

data = s.encode('utf-8') + b'\x00'
data = (s if isinstance(s, bytes) else s.encode("utf-8")) + b'\x00'
top = QlLoaderELF.align(top - len(data), self.ql.pointersize)
self.ql.mem.write(top, data)

Expand Down Expand Up @@ -682,4 +682,4 @@ def get_elfdata_mapping(self, elffile: ELFFile) -> bytes:
# aggregate section data
elfdata_mapping.extend(sec.data())

return bytes(elfdata_mapping)
return bytes(elfdata_mapping)