mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[winpr,collections] fix ListDictionary_Add

Browse Source 
create copies of key and value if the function pointer are set
This commit is contained in:
akallabeth 2023-06-27 14:02:42 +02:00 committed by akallabeth
parent 54847499e9
commit e1ae901858
1 changed files with 65 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

118
winpr/libwinpr/utils/collections/ListDictionary.c
View File

@ -184,59 +184,6 @@ size_t ListDictionary_GetKeys(wListDictionary* listDictionary, ULONG_PTR** ppKey
return count;
}
/**
* Adds an entry with the specified key and value into the ListDictionary.
*/
BOOL ListDictionary_Add(wListDictionary* listDictionary, const void* key, void* value)
{
BOOL ret = FALSE;
WINPR_ASSERT(listDictionary);
if (listDictionary->synchronized)
EnterCriticalSection(&listDictionary->lock);
wListDictionaryItem* item = (wListDictionaryItem*)calloc(1, sizeof(wListDictionaryItem));
if (!item)
goto out_error;
{
union
{
const void* cpv;
void* pv;
} cnv;
cnv.cpv = key;
item->key = cnv.pv;
}
item->value = value;
item->next = NULL;
if (!listDictionary->head)
{
listDictionary->head = item;
}
else
{
wListDictionaryItem* lastItem = listDictionary->head;
while (lastItem->next)
lastItem = lastItem->next;
lastItem->next = item;
}
ret = TRUE;
out_error:
if (listDictionary->synchronized)
LeaveCriticalSection(&listDictionary->lock);
return ret;
}
static void item_free(wListDictionary* listDictionary, wListDictionaryItem* item)
{
WINPR_ASSERT(listDictionary);
@ -265,6 +212,71 @@ static void item_set(wListDictionary* listDictionary, wListDictionaryItem* item,
item->value = value;
}
static wListDictionaryItem* new_item(wListDictionary* listDictionary, const void* key, void* value)
{
wListDictionaryItem* item = (wListDictionaryItem*)calloc(1, sizeof(wListDictionaryItem));
if (!item)
return NULL;
if (listDictionary->objectKey.fnObjectNew)
item->key = listDictionary->objectKey.fnObjectNew(key);
else
item->key = key;
if (!item->key)
goto fail;
item_set(listDictionary, item, value);
if (!item->value)
goto fail;
return item;
fail:
item_free(listDictionary, item);
return NULL;
}
/**
* Adds an entry with the specified key and value into the ListDictionary.
*/
BOOL ListDictionary_Add(wListDictionary* listDictionary, const void* key, void* value)
{
BOOL ret = FALSE;
WINPR_ASSERT(listDictionary);
if (listDictionary->synchronized)
EnterCriticalSection(&listDictionary->lock);
wListDictionaryItem* item = new_item(listDictionary, key, value);
if (!item)
goto out_error;
if (!listDictionary->head)
{
listDictionary->head = item;
}
else
{
wListDictionaryItem* lastItem = listDictionary->head;
while (lastItem->next)
lastItem = lastItem->next;
lastItem->next = item;
}
ret = TRUE;
out_error:
if (listDictionary->synchronized)
LeaveCriticalSection(&listDictionary->lock);
return ret;
}
/**
* Removes all entries from the ListDictionary.
*/