zawz/ztd
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixed memory leak on exec() and sh() functions

Browse source
This commit is contained in:
zawz 2020-11-18 23:53:45 +01:00
parent cf4cb1c4de
commit 9ed2510708
1 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/shell.cpp
View file

@ -31,17 +31,9 @@ std::pair<std::string, int> ztd::shp(const std::string& command)
while (getline(&buff, &buff_size, stream) > 0) while (getline(&buff, &buff_size, stream) > 0)
{ {
ret += buff; ret += buff;
free(buff);
} }
return std::make_pair(ret, WEXITSTATUS(pclose(stream))); return std::make_pair(ret, WEXITSTATUS(pclose(stream)));
/* shc method
std::string ret;
ztd::shc r(command);
r.run();
r.wait_finish();
while(r.has_output())
ret += r.get_output();
return std::make_pair(ret, r.return_value);
*/
} }
// SHC // SHC
@ -119,6 +111,7 @@ void ztd::shc::run_process(shc* p, ztd::wait_pool* wp)
{ {
p->output.push(std::string(buff)); p->output.push(std::string(buff));
p->wp_output.notify_all(); p->wp_output.notify_all();
free(buff);
} }
p->return_value = WEXITSTATUS(ztd::pclose2(stream, pid)); p->return_value = WEXITSTATUS(ztd::pclose2(stream, pid));
@ -162,7 +155,7 @@ FILE* ztd::eopen(const char* type, int* pid, const char* bin, std::vector<char*>
} }
setpgid(child_pid, child_pid); //Needed so negative PIDs can kill children of /bin/sh setpgid(child_pid, child_pid); //Needed so negative PIDs can kill children of /bin/sh
execvp(bin, args.data()); execvp(bin, args.data());
exit(0); exit(1);
} }
else // main process else // main process
{ {
@ -199,6 +192,8 @@ int ztd::eclose(FILE* fd, pid_t pid)
return stat; return stat;
} }
// STANDALONE EXEC
// exec calls // exec calls
// function itself // function itself
std::pair<std::string, int> ztd::exec(std::string const& bin, std::vector<std::string> const& args) std::pair<std::string, int> ztd::exec(std::string const& bin, std::vector<std::string> const& args)
@ -215,6 +210,7 @@ std::pair<std::string, int> ztd::exec(std::string const& bin, std::vector<std::s
while (getline(&buff, &buff_size, stream) > 0) while (getline(&buff, &buff_size, stream) > 0)
{ {
ret += buff; ret += buff;
free(buff);
} }
return std::make_pair(ret, WEXITSTATUS(eclose(stream, pid))); return std::make_pair(ret, WEXITSTATUS(eclose(stream, pid)));
} }