Commit 633d0409 authored by Ulrich Sibiller's avatar Ulrich Sibiller

Args.c: use SAFE_free

parent 122fbd3e
...@@ -195,7 +195,7 @@ int ddxProcessArgument(int argc, char *argv[], int i) ...@@ -195,7 +195,7 @@ int ddxProcessArgument(int argc, char *argv[], int i)
{ {
char *basec = strdup(argv[0]); char *basec = strdup(argv[0]);
nxagentProgName = strdup(basename(basec)); nxagentProgName = strdup(basename(basec));
free(basec); SAFE_free(basec);
/* /*
* Check if we are running as X2Go Agent * Check if we are running as X2Go Agent
...@@ -270,7 +270,7 @@ int ddxProcessArgument(int argc, char *argv[], int i) ...@@ -270,7 +270,7 @@ int ddxProcessArgument(int argc, char *argv[], int i)
{ {
nxagentParseOptionString(envOptions); nxagentParseOptionString(envOptions);
free(envOptions); SAFE_free(envOptions);
} }
for (j = 0; j < argc; j++) for (j = 0; j < argc; j++)
...@@ -378,8 +378,7 @@ int ddxProcessArgument(int argc, char *argv[], int i) ...@@ -378,8 +378,7 @@ int ddxProcessArgument(int argc, char *argv[], int i)
{ {
if (++i < argc) if (++i < argc)
{ {
free(nxagentOptionsFilenameOrString); SAFE_free(nxagentOptionsFilenameOrString);
nxagentOptionsFilenameOrString = NULL;
if (-1 == asprintf(&nxagentOptionsFilenameOrString, "%s", argv[i])) if (-1 == asprintf(&nxagentOptionsFilenameOrString, "%s", argv[i]))
{ {
...@@ -716,8 +715,7 @@ int ddxProcessArgument(int argc, char *argv[], int i) ...@@ -716,8 +715,7 @@ int ddxProcessArgument(int argc, char *argv[], int i)
{ {
if (++i < argc) if (++i < argc)
{ {
free(nxagentKeyboard); SAFE_free(nxagentKeyboard);
nxagentKeyboard = NULL;
nxagentKeyboard = strdup(argv[i]); nxagentKeyboard = strdup(argv[i]);
if (nxagentKeyboard == NULL) if (nxagentKeyboard == NULL)
...@@ -1574,7 +1572,7 @@ static void nxagentParseSingleOption(char *name, char *value) ...@@ -1574,7 +1572,7 @@ static void nxagentParseSingleOption(char *name, char *value)
ddxProcessArgument(argc, argv, 0); ddxProcessArgument(argc, argv, 0);
free(argv[0]); SAFE_free(argv[0]);
} }
static void nxagentParseOptionString(char *string) static void nxagentParseOptionString(char *string)
...@@ -1761,7 +1759,7 @@ void nxagentProcessOptionsFile(char * filename) ...@@ -1761,7 +1759,7 @@ void nxagentProcessOptionsFile(char * filename)
nxagentProcessOptionsFileExit: nxagentProcessOptionsFileExit:
free(data); SAFE_free(data);
if (file) if (file)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment