mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

backlight: Revamp error handling code to not leak the directory

Browse Source 
To neatly free the directory pointer allocated by opendir(), adjust the error
handling paths to go through to the err label.
This commit is contained in:
Rob Bradford
2012-12-05 18:47:09 +00:00
committed by Kristian Høgsberg
parent acfb712127
commit 546c856ade
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libbacklight.c
+9 -8
View File
@@ -149,11 +149,11 @@ struct backlight *backlight_init(struct udev_device *drm_device,
char *pci_name = NULL; char *pci_name = NULL;
char *chosen_path = NULL; char *chosen_path = NULL;
char *path = NULL; char *path = NULL;
DIR *backlights; DIR *backlights = NULL;
struct dirent *entry; struct dirent *entry;
enum backlight_type type = 0; enum backlight_type type = 0;
char buffer[100]; char buffer[100];
struct backlight *backlight; struct backlight *backlight = NULL;
int ret; int ret;
if (!drm_device) if (!drm_device)
@@ -208,10 +208,10 @@ struct backlight *backlight_init(struct udev_device *drm_device,
if (asprintf(&backlight_path, "%s/%s", "/sys/class/backlight", if (asprintf(&backlight_path, "%s/%s", "/sys/class/backlight",
entry->d_name) < 0) entry->d_name) < 0)
return NULL; goto err;
if (asprintf(&path, "%s/%s", backlight_path, "type") < 0) if (asprintf(&path, "%s/%s", backlight_path, "type") < 0)
return NULL; goto err;
fd = open(path, O_RDONLY); fd = open(path, O_RDONLY);
@@ -246,7 +246,7 @@ struct backlight *backlight_init(struct udev_device *drm_device,
free (path); free (path);
if (asprintf(&path, "%s/%s", backlight_path, "device") < 0) if (asprintf(&path, "%s/%s", backlight_path, "device") < 0)
return NULL; goto err;
ret = readlink(path, buffer, sizeof(buffer) - 1); ret = readlink(path, buffer, sizeof(buffer) - 1);
@@ -280,7 +280,7 @@ struct backlight *backlight_init(struct udev_device *drm_device,
} }
if (!chosen_path) if (!chosen_path)
return NULL; goto err;
backlight = malloc(sizeof(struct backlight)); backlight = malloc(sizeof(struct backlight));
@@ -298,10 +298,11 @@ struct backlight *backlight_init(struct udev_device *drm_device,
if (backlight->brightness < 0) if (backlight->brightness < 0)
goto err; goto err;
closedir(backlights);
return backlight; return backlight;
err: err:
if (chosen_path) closedir(backlights);
free(chosen_path); free (chosen_path);
free (backlight); free (backlight);
return NULL; return NULL;
} }