c/libxml2
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxml2 synced 2025-03-28 21:33:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

patch from Gary Coady to fix a race in dict reference counting in

Browse Source 
* dict.c: patch from Gary Coady to fix a race in dict reference
  counting in multithreaded apps.
Daniel
This commit is contained in:
Daniel Veillard 2005-01-21 16:55:41 +00:00
parent b8590d4c1a
commit 1bb16a1888
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Fri Jan 21 17:54:06 CET 2005 Daniel Veillard <daniel@veillard.com>
* dict.c: patch from Gary Coady to fix a race in dict reference
counting in multithreaded apps.
Fri Jan 21 16:08:21 CET 2005 Daniel Veillard <daniel@veillard.com>
* parser.c: fixed bug #164556 where non-fatal errors stopped

19
dict.c
View File

@ -60,6 +60,7 @@ struct _xmlDictStrings {
*/
struct _xmlDict {
int ref_counter;
xmlRMutexPtr mutex;
struct _xmlDictEntry *dict;
int size;
@ -288,8 +289,11 @@ xmlDictCreate(void) {
dict->strings = NULL;
dict->subdict = NULL;
if (dict->dict) {
memset(dict->dict, 0, MIN_DICT_SIZE * sizeof(xmlDictEntry));
return(dict);
if ((dict->mutex = xmlNewRMutex()) != NULL) {
memset(dict->dict, 0, MIN_DICT_SIZE * sizeof(xmlDictEntry));
return(dict);
}
xmlFree(dict->dict);
}
xmlFree(dict);
}
@ -329,7 +333,9 @@ xmlDictCreateSub(xmlDictPtr sub) {
int
xmlDictReference(xmlDictPtr dict) {
if (dict == NULL) return -1;
xmlRMutexLock(dict->mutex);
dict->ref_counter++;
xmlRMutexUnlock(dict->mutex);
return(0);
}
@ -446,8 +452,14 @@ xmlDictFree(xmlDictPtr dict) {
return;
/* decrement the counter, it may be shared by a parser and docs */
xmlRMutexLock(dict->mutex);
dict->ref_counter--;
if (dict->ref_counter > 0) return;
if (dict->ref_counter > 0) {
xmlRMutexUnlock(dict->mutex);
return;
}
xmlRMutexUnlock(dict->mutex);
if (dict->subdict != NULL) {
xmlDictFree(dict->subdict);
@ -477,6 +489,7 @@ xmlDictFree(xmlDictPtr dict) {
xmlFree(pool);
pool = nextp;
}
xmlFreeRMutex(dict->mutex);
xmlFree(dict);
}