MeshCentral/MeshAgent
1
0
Fork 0
mirror of https://github.com/Ylianst/MeshAgent synced 2025-12-15 07:43:50 +00:00
Code Issues Releases Wiki Activity

Fixed memory leak when writing compressed record

Browse Source
This commit is contained in:
Bryan Roe
2020-07-30 21:30:50 -07:00
parent 2e1d102311
commit 8f43ced7a1
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
microstack/ILibSimpleDataStore.c
View File

@@ -733,6 +733,7 @@ __EXPORT_TYPE void ILibSimpleDataStore_Close(ILibSimpleDataStore dataStore)
// Store a key/value pair in the data store // Store a key/value pair in the data store
__EXPORT_TYPE int ILibSimpleDataStore_PutEx2(ILibSimpleDataStore dataStore, char* key, int keyLen, char* value, int valueLen, char *vhash) __EXPORT_TYPE int ILibSimpleDataStore_PutEx2(ILibSimpleDataStore dataStore, char* key, int keyLen, char* value, int valueLen, char *vhash)
{ {
int keyAllocated = 0;
int allocated = 0; int allocated = 0;
int ret; int ret;
char hash[SHA384HASHSIZE]; char hash[SHA384HASHSIZE];
@@ -761,6 +762,7 @@ __EXPORT_TYPE int ILibSimpleDataStore_PutEx2(ILibSimpleDataStore dataStore, char
// Calculate the key to use for the compressed record entry // Calculate the key to use for the compressed record entry
char *tmpkey = (char*)ILibMemory_SmartAllocate(keyLen + sizeof(int)); char *tmpkey = (char*)ILibMemory_SmartAllocate(keyLen + sizeof(int));
keyAllocated = 1;
memcpy_s(tmpkey, ILibMemory_Size(tmpkey), key, keyLen); memcpy_s(tmpkey, ILibMemory_Size(tmpkey), key, keyLen);
((uint32_t*)(tmpkey + keyLen))[0] = crc32c(0, (unsigned char*)tmpkey, keyLen); ((uint32_t*)(tmpkey + keyLen))[0] = crc32c(0, (unsigned char*)tmpkey, keyLen);
key = tmpkey; key = tmpkey;
@@ -795,6 +797,7 @@ __EXPORT_TYPE int ILibSimpleDataStore_PutEx2(ILibSimpleDataStore dataStore, char
// and re-write this record into the cache // and re-write this record into the cache
// //
if (allocated) { free(entry); } if (allocated) { free(entry); }
if (keyAllocated) { ILibMemory_Free(key); }
ILibSimpleDataStore_CachedEx(root, origkey, origkeylen, value, valueLen, vhash); ILibSimpleDataStore_CachedEx(root, origkey, origkeylen, value, valueLen, vhash);
ILibSimpleDataStore_ReOpenReadOnly(root, NULL); ILibSimpleDataStore_ReOpenReadOnly(root, NULL);
if (root->ErrorHandler != NULL) { root->ErrorHandler(root, root->ErrorHandlerUser); } if (root->ErrorHandler != NULL) { root->ErrorHandler(root, root->ErrorHandlerUser); }
@@ -807,6 +810,7 @@ __EXPORT_TYPE int ILibSimpleDataStore_PutEx2(ILibSimpleDataStore dataStore, char
{ {
root->warningSink(root, root->fileSize, root->warningSinkUser); root->warningSink(root, root->fileSize, root->warningSinkUser);
} }
if (keyAllocated) { ILibMemory_Free(key); }
return(ret); return(ret);
} }