Merge pull request #951 from ucgJhe/dev

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

Author: xwings

qiling/loader/elf.py

@@ -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)
 
@@ -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)