projects
/
platform
/
upstream
/
efl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9ac13e4
)
ecore: fix segfault while adding new local or global data to thread.
author
Mariusz Grzegorczyk
<mariusz.g@samsung.com>
Tue, 3 Sep 2013 03:44:27 +0000
(12:44 +0900)
committer
Cedric Bail
<cedric.bail@samsung.com>
Tue, 3 Sep 2013 03:44:27 +0000
(12:44 +0900)
src/lib/ecore/ecore_thread.c
patch
|
blob
|
history
diff --git
a/src/lib/ecore/ecore_thread.c
b/src/lib/ecore/ecore_thread.c
index
255aa21
..
ee13c45
100644
(file)
--- a/
src/lib/ecore/ecore_thread.c
+++ b/
src/lib/ecore/ecore_thread.c
@@
-1135,9
+1135,14
@@
ecore_thread_local_data_set(Ecore_Thread *thread,
r = eina_hash_set(worker->hash, key, d);
CDB(worker->cond);
- ret = r->data;
- free(r);
- return ret;
+
+ if (r)
+ {
+ ret = r->data;
+ free(r);
+ return ret;
+ }
+ return NULL;
}
EAPI void *
@@
-1246,9
+1251,13
@@
ecore_thread_global_data_set(const char *key,
LRWKU(_ecore_thread_global_hash_lock);
CDB(_ecore_thread_global_hash_cond);
- ret = r->data;
- free(r);
- return ret;
+ if (r)
+ {
+ ret = r->data;
+ free(r);
+ return ret;
+ }
+ return NULL;
}
EAPI void *