summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiyoun Park <jy0703.park@samsung.com>2013-03-05 14:01:32 +0900
committerJiyoun Park <jy0703.park@samsung.com>2013-03-05 14:01:32 +0900
commit004d519f06646c61d3af9b037a36d8898da8a8ea (patch)
treee127aebe62c5e1484b5197a1a28321f074e37a28
parentbc78f49d718cb7e70acc870d59478fa2659efd3c (diff)
ecore_x : fix dangling pointer problem related with shmget fail
-rw-r--r--ChangeLog4
-rw-r--r--NEWS1
-rw-r--r--src/lib/ecore_x/xlib/ecore_x_image.c2
3 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 42a6cd7b9e..d91c74b2bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
12013-03-05 Jiyoun Park (Jypar)
2
3 * Ecore_x: Fix dangling pointer problem related with shmget fail
4
12013-03-04 Sung W. Park (sung_) 52013-03-04 Sung W. Park (sung_)
2 6
3 * Evas Evas_GL: removed resource surface/context pool in favor of 7 * Evas Evas_GL: removed resource surface/context pool in favor of
diff --git a/NEWS b/NEWS
index 837de78c2e..a2100bdc5d 100644
--- a/NEWS
+++ b/NEWS
@@ -185,3 +185,4 @@ Fixes:
185 * Evas cache: remove the freed worker from the pthread worker list when it's failed to create a new thread so as not to access it if a thread is working newly. 185 * Evas cache: remove the freed worker from the pthread worker list when it's failed to create a new thread so as not to access it if a thread is working newly.
186 * fix custom states for edje SPACER parts 186 * fix custom states for edje SPACER parts
187 * fix edje program filters 187 * fix edje program filters
188 * fix dangling pointer problem related with shmget fail
diff --git a/src/lib/ecore_x/xlib/ecore_x_image.c b/src/lib/ecore_x/xlib/ecore_x_image.c
index 97606f50b1..67b7142ff0 100644
--- a/src/lib/ecore_x/xlib/ecore_x_image.c
+++ b/src/lib/ecore_x/xlib/ecore_x_image.c
@@ -176,6 +176,7 @@ _ecore_x_image_shm_create(Ecore_X_Image *im)
176 if (im->shminfo.shmid == -1) 176 if (im->shminfo.shmid == -1)
177 { 177 {
178 XDestroyImage(im->xim); 178 XDestroyImage(im->xim);
179 im->xim = NULL;
179 return; 180 return;
180 } 181 }
181 182
@@ -188,6 +189,7 @@ _ecore_x_image_shm_create(Ecore_X_Image *im)
188 shmdt(im->shminfo.shmaddr); 189 shmdt(im->shminfo.shmaddr);
189 shmctl(im->shminfo.shmid, IPC_RMID, 0); 190 shmctl(im->shminfo.shmid, IPC_RMID, 0);
190 XDestroyImage(im->xim); 191 XDestroyImage(im->xim);
192 im->xim = NULL;
191 return; 193 return;
192 } 194 }
193 195