Apply patch from Scott Lamb fixing some memory and resource leaks.

[oweals/tinc.git] / src / process.c

diff --git a/src/process.c b/src/process.c
index 9194bedf73cbfd0b8701ee9233078b862c41268f..30ff82ad5ec700d86de5af753a65cbc388d4f00e 100644 (file)
--- a/src/process.c
+++ b/src/process.c
@@ -1,7 +1,7 @@
 /*
     process.c -- process management functions
-    Copyright (C) 1999-2004 Ivo Timmermans <ivo@tinc-vpn.org>,
-                  2000-2004 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 1999-2005 Ivo Timmermans,
+                  2000-2006 Guus Sliepen <guus@tinc-vpn.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -81,30 +81,30 @@ bool install_service(void) {
        }
 
        if(!strchr(program_name, '\\')) {
-               GetCurrentDirectory(sizeof(command) - 1, command + 1);
-               strncat(command, "\\", sizeof(command));
+               GetCurrentDirectory(sizeof command - 1, command + 1);
+               strncat(command, "\\", sizeof command - strlen(command));
        }
 
-       strncat(command, program_name, sizeof(command));
+       strncat(command, program_name, sizeof command - strlen(command));
 
-       strncat(command, "\"", sizeof(command));
+       strncat(command, "\"", sizeof command - strlen(command));
 
        for(argp = g_argv + 1; *argp; argp++) {
                space = strchr(*argp, ' ');
-               strncat(command, " ", sizeof(command));
+               strncat(command, " ", sizeof command - strlen(command));
                
                if(space)
-                       strncat(command, "\"", sizeof(command));
+                       strncat(command, "\"", sizeof command - strlen(command));
                
-               strncat(command, *argp, sizeof(command));
+               strncat(command, *argp, sizeof command - strlen(command));
 
                if(space)
-                       strncat(command, "\"", sizeof(command));
+                       strncat(command, "\"", sizeof command - strlen(command));
        }
 
        service = CreateService(manager, identname, identname,
                        SERVICE_ALL_ACCESS, SERVICE_WIN32_OWN_PROCESS, SERVICE_AUTO_START, SERVICE_ERROR_NORMAL,
-                       command, "NDIS", NULL, NULL, NULL, NULL);
+                       command, NULL, NULL, NULL, NULL, NULL);
        
        if(!service) {
                logger(LOG_ERR, _("Could not create %s service: %s"), identname, winerror(GetLastError()));
@@ -379,8 +379,10 @@ bool execute_script(const char *name, char **envp)
 
        /* First check if there is a script */
 
-       if(stat(scriptname + 1, &s))
+       if(stat(scriptname + 1, &s)) {
+               free(scriptname);
                return true;
+       }
 
        ifdebug(STATUS) logger(LOG_INFO, _("Executing script %s"), name);