summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarsten Haitzler (Rasterman) <raster@rasterman.com>2013-12-15 11:25:56 +0900
committerCarsten Haitzler (Rasterman) <raster@rasterman.com>2013-12-15 11:25:56 +0900
commit5dfe3789f225308069d4593e99cf38145601beb6 (patch)
tree13e4fffed462b7b63af4747892bc892074c928a9
parentf1fa8de149b7622426acfd4ea4926e9d34a73e0d (diff)
evas - fb engine - fix mem leak if ioctl fails on fb mode
this fixes CID 1137852
-rw-r--r--src/bin/evas/evas_cserve2_usage.c1
-rw-r--r--src/modules/evas/engines/fb/evas_fb_main.c1
2 files changed, 2 insertions, 0 deletions
diff --git a/src/bin/evas/evas_cserve2_usage.c b/src/bin/evas/evas_cserve2_usage.c
index 3ab78a838..462ba263e 100644
--- a/src/bin/evas/evas_cserve2_usage.c
+++ b/src/bin/evas/evas_cserve2_usage.c
@@ -74,6 +74,7 @@ _server_connect(void)
len = strlen(remote.sun_path) + sizeof(remote.sun_family);
if (connect(s, (struct sockaddr *)&remote, len) == -1)
{
+ close(s);
ERR("connect");
return EINA_FALSE;
}
diff --git a/src/modules/evas/engines/fb/evas_fb_main.c b/src/modules/evas/engines/fb/evas_fb_main.c
index 451171d97..b958c924e 100644
--- a/src/modules/evas/engines/fb/evas_fb_main.c
+++ b/src/modules/evas/engines/fb/evas_fb_main.c
@@ -322,6 +322,7 @@ fb_getmode(void)
if (ioctl(fb, FBIOGET_VSCREENINFO, &mode->fb_var) == -1)
{
perror("ioctl FBIOGET_VSCREENINFO");
+ free(mode);
return NULL;
}