Rooba
/
pupy
mirror of https://github.com/n1nj4sec/pupy.git
1
1
Fork 0
Code Issues Packages Projects Releases Wiki Activity

lzmafree now want to know size

This commit is contained in:
Oleksii Shevchuk 2018-01-13 11:17:29 +02:00
parent 32a5eb55f5
commit d61d94de47
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/sources-linux/pupy_load.c
View File

@ -53,7 +53,7 @@ static inline void* xz_dynload(const char *soname, const char *xzbuf, size_t xzs
void *res = memdlopen(soname, (char *) uncompressed, uncompressed_size); void *res = memdlopen(soname, (char *) uncompressed, uncompressed_size);
lzmafree(uncompressed); lzmafree(uncompressed, uncompressed_size);
if (!res) { if (!res) {
dprint("loading %s from memory failed\n", soname); dprint("loading %s from memory failed\n", soname);

13
client/sources/pupy_load.c
View File

@ -52,14 +52,15 @@ DWORD WINAPI mainThread(LPVOID lpArg)
dfprint(stderr, "TEMPLATE REV: %s\n", GIT_REVISION_HEAD); dfprint(stderr, "TEMPLATE REV: %s\n", GIT_REVISION_HEAD);
if(!GetModuleHandle("msvcr90.dll")) { if(!GetModuleHandle("msvcr90.dll")) {
size_t msvcr90_size;
void *msvcr90 = lzmaunpack( void *msvcr90 = lzmaunpack(
msvcr90_c_start, msvcr90_c_start,
msvcr90_c_size, msvcr90_c_size,
NULL &msvcr90_size
); );
int r = _load_msvcr90(msvcr90); int r = _load_msvcr90(msvcr90);
lzmafree(msvcr90); lzmafree(msvcr90, msvcr90_size);
dfprint(stderr,"loading msvcr90.dll: %d\n", r); dfprint(stderr,"loading msvcr90.dll: %d\n", r);
} }
@ -79,9 +80,10 @@ DWORD WINAPI mainThread(LPVOID lpArg)
_load_python_FromFile("python27.dll"); // does not actually load a new python, but uses the handle of the already loaded one _load_python_FromFile("python27.dll"); // does not actually load a new python, but uses the handle of the already loaded one
} }
else{ else{
void *python27 = lzmaunpack(python27_c_start, python27_c_size, NULL); size_t python27_size;
void *python27 = lzmaunpack(python27_c_start, python27_c_size, &python27_size);
int res = _load_python("python27.dll", python27); int res = _load_python("python27.dll", python27);
lzmafree(python27); lzmafree(python27, python27_size);
if(!res) { if(!res) {
dfprint(stderr,"loading python27.dll from memory failed\n"); dfprint(stderr,"loading python27.dll from memory failed\n");
@ -98,7 +100,7 @@ DWORD WINAPI mainThread(LPVOID lpArg)
} }
} }
} }
dfprint(stderr,"python interpreter loaded\n"); dfprint(stderr,"python interpreter loaded\n");
} }
} }
dfprint(stderr,"calling PyEval_InitThreads() ...\n"); dfprint(stderr,"calling PyEval_InitThreads() ...\n");
@ -130,6 +132,7 @@ DWORD WINAPI mainThread(LPVOID lpArg)
bootloader_c_start, bootloader_c_start,
bootloader_c_size bootloader_c_size
); );
if (seq) { if (seq) {
Py_ssize_t i, max = PySequence_Length(seq); Py_ssize_t i, max = PySequence_Length(seq);
for (i=0;i<max;i++) { for (i=0;i<max;i++) {