StarMirror/toxcore
1
0
Fork 0
mirror of https://github.com/irungentoo/toxcore.git synced 2024-03-22 13:30:51 +08:00
Code Issues Projects Releases Wiki Activity

Fix scope, ressource leaks in boostrap daemon

Browse Source 
Reduce scope of config_setting_t *elem

Fix various leaks of files keys_file and pid_file
This commit is contained in:
Tux3 / Mlkj / !Lev.uXFMLA 2014-06-18 23:38:38 +02:00
parent 888ebea619
commit 4c12ee3e30
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
other/bootstrap_daemon/tox_bootstrap_daemon.c
View File

@ -91,6 +91,7 @@ int manage_keys(DHT *dht, char *keys_file_path)
size_t read_size = fread(keys, sizeof(uint8_t), KEYS_SIZE, keys_file); size_t read_size = fread(keys, sizeof(uint8_t), KEYS_SIZE, keys_file);
if (read_size != KEYS_SIZE) { if (read_size != KEYS_SIZE) {
fclose(keys_file);
return 0; return 0;
} }
@ -106,6 +107,7 @@ int manage_keys(DHT *dht, char *keys_file_path)
size_t write_size = fwrite(keys, sizeof(uint8_t), KEYS_SIZE, keys_file); size_t write_size = fwrite(keys, sizeof(uint8_t), KEYS_SIZE, keys_file);
if (write_size != KEYS_SIZE) { if (write_size != KEYS_SIZE) {
fclose(keys_file);
return 0; return 0;
} }
} }
@ -174,12 +176,9 @@ void parse_tcp_relay_ports_config(config_t *cfg, uint16_t **tcp_relay_ports, int
*tcp_relay_ports = malloc(config_port_count * sizeof(uint16_t)); *tcp_relay_ports = malloc(config_port_count * sizeof(uint16_t));
config_setting_t *elem;
int i; int i;
for (i = 0; i < config_port_count; i ++) { for (i = 0; i < config_port_count; i ++) {
config_setting_t *elem = config_setting_get_elem(ports_array, i);
elem = config_setting_get_elem(ports_array, i);
if (elem == NULL) { if (elem == NULL) {
// it's NULL if `ports_array` is not an array (we have that check ealier) or if `i` is out of range, which should not be // it's NULL if `ports_array` is not an array (we have that check ealier) or if `i` is out of range, which should not be
@ -513,8 +512,10 @@ int main(int argc, char *argv[])
} }
// Check if the PID file exists // Check if the PID file exists
if (fopen(pid_file_path, "r")) { FILE* pid_file;
if (pid_file = fopen(pid_file_path, "r")) {
syslog(LOG_ERR, "Another instance of the daemon is already running, PID file %s exists.\n", pid_file_path); syslog(LOG_ERR, "Another instance of the daemon is already running, PID file %s exists.\n", pid_file_path);
fclose(pid_file);
} }
IP ip; IP ip;
@ -596,18 +597,20 @@ int main(int argc, char *argv[])
// Fork off from the parent process // Fork off from the parent process
pid_t pid = fork(); pid_t pid = fork();
if (pid < 0) {
fclose(pidf);
syslog(LOG_ERR, "Forking failed. Exiting.\n");
return 1;
}
if (pid > 0) { if (pid > 0) {
fprintf(pidf, "%d ", pid); fprintf(pidf, "%d ", pid);
fclose(pidf); fclose(pidf);
syslog(LOG_DEBUG, "Forked successfully: PID: %d.\n", pid); syslog(LOG_DEBUG, "Forked successfully: PID: %d.\n", pid);
return 0; return 0;
} }
else {
fclose(pidf);
}
if (pid < 0) {
syslog(LOG_ERR, "Forking failed. Exiting.\n");
return 1;
}
// Change the file mode mask // Change the file mode mask
umask(0); umask(0);