kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix prev pointer during stringshare_del. 

SVN revision: 36319
This commit is contained in:
Cedric BAIL 2008-09-29 17:07:50 +00:00
parent b6960f58b6
commit 0bc2413113
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
legacy/eina/src/lib/eina_stringshare.c
View File

@ -112,6 +112,7 @@ struct _Eina_Stringshare_Head
{ {
EINA_RBTREE; EINA_RBTREE;
EINA_MAGIC; EINA_MAGIC;
int hash; int hash;
Eina_Stringshare_Node *head; Eina_Stringshare_Node *head;
@ -310,23 +311,24 @@ eina_stringshare_add(const char *str)
hash &= EINA_STRINGSHARE_MASK; hash &= EINA_STRINGSHARE_MASK;
ed = (Eina_Stringshare_Head*) eina_rbtree_inline_lookup((Eina_Rbtree*) share->buckets[hash_num], ed = (Eina_Stringshare_Head*) eina_rbtree_inline_lookup((Eina_Rbtree*) share->buckets[hash_num],
&hash, sizeof (hash), &hash, 0,
EINA_RBTREE_CMP_KEY_CB(_eina_stringshare_cmp), NULL); EINA_RBTREE_CMP_KEY_CB(_eina_stringshare_cmp), NULL);
if (!ed) if (!ed)
{ {
ed = malloc(sizeof (Eina_Stringshare_Head) + sizeof (Eina_Stringshare_Node) + slen); ed = malloc(sizeof (Eina_Stringshare_Head) + sizeof (Eina_Stringshare_Node) + slen);
if (!ed) return NULL; if (!ed) return NULL;
EINA_MAGIC_SET(ed, EINA_MAGIC_STRINGSHARE_HEAD);
ed->hash = hash; ed->hash = hash;
ed->head = NULL; ed->head = NULL;
EINA_MAGIC_SET(ed, EINA_MAGIC_STRINGSHARE_HEAD);
share->buckets[hash_num] = (Eina_Stringshare_Head*) eina_rbtree_inline_insert((Eina_Rbtree*) share->buckets[hash_num], share->buckets[hash_num] = (Eina_Stringshare_Head*) eina_rbtree_inline_insert((Eina_Rbtree*) share->buckets[hash_num],
EINA_RBTREE_GET(ed), EINA_RBTREE_GET(ed),
EINA_RBTREE_CMP_NODE_CB(_eina_stringshare_node), NULL); EINA_RBTREE_CMP_NODE_CB(_eina_stringshare_node), NULL);
nel = (Eina_Stringshare_Node*) (ed + 1); nel = (Eina_Stringshare_Node*) (ed + 1);
EINA_MAGIC_SET(nel, EINA_MAGIC_STRINGSHARE_NODE); EINA_MAGIC_SET(nel, EINA_MAGIC_STRINGSHARE_NODE);
nel->begin = EINA_TRUE; nel->begin = EINA_TRUE;
} }
@ -354,9 +356,9 @@ eina_stringshare_add(const char *str)
{ {
nel = malloc(sizeof (Eina_Stringshare_Node) + slen); nel = malloc(sizeof (Eina_Stringshare_Node) + slen);
if (!nel) return NULL; if (!nel) return NULL;
nel->begin = EINA_FALSE;
EINA_MAGIC_SET(nel, EINA_MAGIC_STRINGSHARE_NODE); EINA_MAGIC_SET(nel, EINA_MAGIC_STRINGSHARE_NODE);
nel->begin = EINA_FALSE;
} }
nel->references = 1; nel->references = 1;
@ -395,7 +397,7 @@ eina_stringshare_del(const char *str)
hash &= EINA_STRINGSHARE_MASK; hash &= EINA_STRINGSHARE_MASK;
ed = (Eina_Stringshare_Head*) eina_rbtree_inline_lookup(EINA_RBTREE_GET(share->buckets[hash_num]), ed = (Eina_Stringshare_Head*) eina_rbtree_inline_lookup(EINA_RBTREE_GET(share->buckets[hash_num]),
&hash, sizeof (hash), &hash, 0,
EINA_RBTREE_CMP_KEY_CB(_eina_stringshare_cmp), NULL); EINA_RBTREE_CMP_KEY_CB(_eina_stringshare_cmp), NULL);
if (!ed) goto on_error; if (!ed) goto on_error;
@ -403,11 +405,13 @@ eina_stringshare_del(const char *str)
for (prev = NULL, el = ed->head; for (prev = NULL, el = ed->head;
el && (const char*) (el + 1) != str; el && (const char*) (el + 1) != str;
el = el->next) prev = el, el = el->next)
; ;
if (!el) goto on_error; if (!el) goto on_error;
EINA_MAGIC_CHECK_STRINGSHARE_NODE(el);
el->references--; el->references--;
if (el->references == 0) if (el->references == 0)
{ {