procxx
/
kepka
mirror of https://github.com/procxx/kepka.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix possible buffer overflow in Linux Updater. 

Fixes #5227.
This commit is contained in:
John Preston 2018-10-09 12:13:41 +03:00
parent f43752b3ad
commit f9632d5c43
1 changed files with 28 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
Telegram/SourceFiles/_other/updater_linux.cpp
View File

@ -14,6 +14,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
#include <pwd.h> #include <pwd.h>
#include <string> #include <string>
#include <deque> #include <deque>
#include <vector>
#include <cstring> #include <cstring>
#include <cerrno> #include <cerrno>
#include <algorithm> #include <algorithm>
@ -23,6 +24,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
using std::string; using std::string;
using std::deque; using std::deque;
using std::vector;
using std::cout; using std::cout;
bool do_mkdir(const char *path) { // from http://stackoverflow.com/questions/675039/how-can-i-create-directory-tree-in-c-linux bool do_mkdir(const char *path) { // from http://stackoverflow.com/questions/675039/how-can-i-create-directory-tree-in-c-linux
@ -439,43 +441,39 @@ int main(int argc, char *argv[]) {
writeLog("Error: short exe name!"); writeLog("Error: short exe name!");
} }
static const int MaxLen = 65536, MaxArgsCount = 128; auto fullBinaryPath = exePath + exeName;
const auto path = fullBinaryPath.c_str();
char path[MaxLen] = {0}; auto args = vector<const char*>();
string fullBinaryPath = exePath + exeName; const auto push = [&](const char *arg) {
strcpy(path, fullBinaryPath.c_str()); args.push_back(arg);
};
char *args[MaxArgsCount] = { 0 }; push(path);
char p_noupdate[] = "-noupdate"; push("-noupdate");
char p_autostart[] = "-autostart"; if (autostart) push("-autostart");
char p_debug[] = "-debug"; if (debug) push("-debug");
char p_tosettings[] = "-tosettings"; if (startintray) push("-startintray");
char p_key[] = "-key"; if (testmode) push("-testmode");
char p_startintray[] = "-startintray"; if (externalupdater) push("-externalupdater");
char p_testmode[] = "-testmode"; if (tosettings) push("-tosettings");
char p_externalupdater[] = "-externalupdater";
char p_workdir[] = "-workdir";
int argIndex = 0;
args[argIndex++] = path;
args[argIndex++] = p_noupdate;
if (autostart) args[argIndex++] = p_autostart;
if (debug) args[argIndex++] = p_debug;
if (startintray) args[argIndex++] = p_startintray;
if (testmode) args[argIndex++] = p_testmode;
if (externalupdater) args[argIndex++] = p_externalupdater;
if (tosettings) args[argIndex++] = p_tosettings;
if (key) { if (key) {
args[argIndex++] = p_key; push("-key");
args[argIndex++] = key; push(key);
} }
if (customWorkingDir && workdir) { if (customWorkingDir && workdir) {
args[argIndex++] = p_workdir; push("-workdir");
args[argIndex++] = workdir; push(workdir);
} }
push(nullptr);
pid_t pid = fork(); pid_t pid = fork();
switch (pid) { switch (pid) {
case -1: writeLog("fork() failed!"); return 1; case -1:
case 0: execv(path, args); return 1; writeLog("fork() failed!");
return 1;
case 0:
execv(path, args.data());
return 1;
} }
writeLog("Executed Telegram, closing log and quitting.."); writeLog("Executed Telegram, closing log and quitting..");