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

Fix double free issue on exec() and sh() functions

Browse source
This commit is contained in:
zawz 2020-11-19 14:50:18 +01:00
parent 9ed2510708
commit 5d2ee5e001
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/shell.cpp
View file

@ -31,8 +31,8 @@ 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);
} }
free(buff);
return std::make_pair(ret, WEXITSTATUS(pclose(stream))); return std::make_pair(ret, WEXITSTATUS(pclose(stream)));
} }
@ -111,8 +111,8 @@ 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);
} }
free(buff);
p->return_value = WEXITSTATUS(ztd::pclose2(stream, pid)); p->return_value = WEXITSTATUS(ztd::pclose2(stream, pid));
p->running = false; p->running = false;
@ -210,8 +210,8 @@ 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);
} }
free(buff);
return std::make_pair(ret, WEXITSTATUS(eclose(stream, pid))); return std::make_pair(ret, WEXITSTATUS(eclose(stream, pid)));
} }
std::pair<std::string, int> ztd::script(std::string const& data, std::vector<std::string> const& args) std::pair<std::string, int> ztd::script(std::string const& data, std::vector<std::string> const& args)