denozord/strongswan-ext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Properly munmap/close file if loading IMC/IMV fails.

Browse Source
This commit is contained in:
Tobias Brunner
2012-05-18 12:32:31 +02:00
parent 7a56c35fc9
commit 769696450a
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libtnccs/tnc/tnc.c
+6 -6
View File
@@ -75,6 +75,7 @@ void libtnccs_deinit(void)
static bool load_imcvs_from_config(char *filename, bool is_imc) static bool load_imcvs_from_config(char *filename, bool is_imc)
{ {
bool success = FALSE;
int fd, line_nr = 0; int fd, line_nr = 0;
chunk_t src, line; chunk_t src, line;
struct stat sb; struct stat sb;
@@ -110,7 +111,6 @@ static bool load_imcvs_from_config(char *filename, bool is_imc)
while (fetchline(&src, &line)) while (fetchline(&src, &line))
{ {
char *name, *path; char *name, *path;
bool success;
chunk_t token; chunk_t token;
line_nr++; line_nr++;
@@ -126,7 +126,7 @@ static bool load_imcvs_from_config(char *filename, bool is_imc)
{ {
DBG1(DBG_TNC, "line %d: keyword must be followed by a space", DBG1(DBG_TNC, "line %d: keyword must be followed by a space",
line_nr); line_nr);
return FALSE; break;
} }
/* only interested in IMCs or IMVs depending on label */ /* only interested in IMCs or IMVs depending on label */
@@ -141,7 +141,7 @@ static bool load_imcvs_from_config(char *filename, bool is_imc)
{ {
DBG1(DBG_TNC, "line %d: %s name must be set in double quotes", DBG1(DBG_TNC, "line %d: %s name must be set in double quotes",
line_nr, label); line_nr, label);
return FALSE; break;
} }
/* copy the IMC/IMV name */ /* copy the IMC/IMV name */
@@ -154,7 +154,7 @@ static bool load_imcvs_from_config(char *filename, bool is_imc)
{ {
DBG1(DBG_TNC, "line %d: %s path is missing", line_nr, label); DBG1(DBG_TNC, "line %d: %s path is missing", line_nr, label);
free(name); free(name);
return FALSE; break;
} }
if (!extract_token(&token, ' ', &line)) if (!extract_token(&token, ' ', &line))
{ {
@@ -177,12 +177,12 @@ static bool load_imcvs_from_config(char *filename, bool is_imc)
} }
if (!success) if (!success)
{ {
return FALSE; break;
} }
} }
munmap(addr, sb.st_size); munmap(addr, sb.st_size);
close(fd); close(fd);
return TRUE; return success;
} }
/** /**