Attachment 4476 Details for Bug 27729

[patch] [v2] Close file descriptor

27729_listener-fd-leak.diff (text/plain), 1.06 KB, created by Philipp Hahn on 2012-06-25 09:30 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Philipp Hahn

Created: 2012-06-25 09:30 CEST

Size: 1.06 KB

patch

obsolete

>commit bbfbf0d65a3fac037fd3def019b961b818fd106e
>Author: Philipp Hahn <hahn@univention.de>
>Date:   Fri Jun 22 23:38:51 2012 +0200
>
>    Bug #27729: Close file descriptor
>    
>    The listener kept a file descriptor open to the password file, which
>    leaks resources.
>    
>    Close the file after reading the machine secret.
>    Also better handle empty files and read errors.
>
>diff --git a/branches/ucs-3.0/ucs/management/univention-directory-listener/src/main.c b/branches/ucs-3.0/ucs/management/univention-directory-listener/src/main.c
>index fde6ce4..09388fe 100644
>--- a/branches/ucs-3.0/ucs/management/univention-directory-listener/src/main.c
>+++ b/branches/ucs-3.0/ucs/management/univention-directory-listener/src/main.c
>@@ -79,10 +79,15 @@ static char* read_pwd_from_file(char *filename)
> 
> 	if ((fp = fopen(filename, "r")) == NULL)
> 		return NULL;
>-	if (fgets(line, 1024, fp) == NULL)
>+	if (fgets(line, 1024, fp) == NULL) {
>+		fclose(fp);
> 		return NULL;
>+	}
>+	fclose(fp);
> 
> 	len = strlen(line);
>+	if (!len)
>+		return NULL;
> 	if (line[len-1] == '\n')
> 		line[len-1] = '\0';
>

Actions: View | Diff

Attachments on bug 27729: 4475 | 4476