starred/simplewall
1
0 Fork 0
mirror of https://github.com/henrypp/simplewall.git synced 2026-10-21 18:43:09 -05:00
Code Issues Packages Projects Releases 10 Wiki Activity

fix memory leak and add profile type

Browse Source
This commit is contained in:
henrypp committed 2023-07-03 17:54:15 +06:00
1 parent 47adf36e5d
commit fe02304b09
2 files changed
+40 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/db.c
+37 -3
View File
@@ -221,6 +221,7 @@ VOID _app_db_parse_app (
PITEM_APP ptr_app;
ULONG_PTR app_hash;
PR_STRING string;
PR_STRING hash;
PR_STRING dos_path;
LONG64 timestamp;
LONG64 timer;
@@ -258,6 +259,11 @@ VOID _app_db_parse_app (
timestamp = _r_xml_getattribute_long64 (&db_info->xml_library, L"timestamp");
timer = _r_xml_getattribute_long64 (&db_info->xml_library, L"timer");
hash = _r_xml_getattribute_string (&db_info->xml_library, L"hash");
if (hash)
_app_setappinfo (ptr_app, INFO_HASH, hash);
if (is_silent)
_app_setappinfo (ptr_app, INFO_IS_SILENT, IntToPtr (is_silent));
@@ -616,6 +622,7 @@ NTSTATUS _app_db_encodebody (
if (!NT_SUCCESS (status))
{
_r_obj_dereference (hash_value);
_r_obj_dereference (bytes);
return status;
@@ -625,17 +632,18 @@ NTSTATUS _app_db_encodebody (
{
case PROFILE2_ID_PLAIN:
{
new_bytes = bytes;
new_bytes = _r_obj_reference (bytes);
break;
}
case PROFILE2_ID_COMPRESSED:
{
// compress body
status = _r_sys_compressbuffer (COMPRESSION_FORMAT_LZNT1 | COMPRESSION_ENGINE_MAXIMUM, &bytes->sr, &new_bytes);
status = _r_sys_compressbuffer (COMPRESSION_FORMAT_XPRESS | COMPRESSION_ENGINE_MAXIMUM, &bytes->sr, &new_bytes);
if (!NT_SUCCESS (status))
{
_r_obj_dereference (hash_value);
_r_obj_dereference (bytes);
return status;
@@ -650,6 +658,7 @@ NTSTATUS _app_db_encodebody (
if (!NT_SUCCESS (status))
{
_r_obj_dereference (hash_value);
_r_obj_dereference (bytes);
return status;
@@ -873,6 +882,28 @@ NTSTATUS _app_db_savetofile (
return status;
}
FORCEINLINE BYTE _app_getprofiletype ()
{
LONG profile_type;
profile_type = _r_config_getlong (L"ProfileType", 0);
switch (profile_type)
{
case 1:
{
return PROFILE2_ID_COMPRESSED;
}
case 2:
{
return PROFILE2_ID_ENCRYPTED;
}
}
return PROFILE2_ID_PLAIN;
}
_Success_ (NT_SUCCESS (return))
NTSTATUS _app_db_save_streamtofile (
_Inout_ PDB_INFORMATION db_info,
@@ -882,6 +913,7 @@ NTSTATUS _app_db_save_streamtofile (
PR_BYTE new_bytes;
HANDLE hfile;
ULONG unused;
BYTE profile_type;
NTSTATUS status;
hfile = CreateFile (path->buffer, GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_DELETE, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
@@ -889,7 +921,9 @@ NTSTATUS _app_db_save_streamtofile (
if (!_r_fs_isvalidhandle (hfile))
return RtlGetLastNtStatus ();
status = _app_db_encodebody (db_info, PROFILE2_ID_ENCRYPTED, &new_bytes);
profile_type = _app_getprofiletype ();
status = _app_db_encodebody (db_info, profile_type, &new_bytes);
if (NT_SUCCESS (status))
WriteFile (hfile, new_bytes->buffer, (ULONG)new_bytes->length, &unused, NULL);
src/db.h
+3 -3
View File
@@ -51,10 +51,10 @@ static const BYTE profile2_fourcc[] = {
#define XML_VERSION_CURRENT XML_VERSION_4
#define XML_VERSION_MAXIMUM XML_VERSION_5
#define XML_PROFILE_EXT L"xml"
#define XML_PROFILE_FILE L"profile.sp"
#define XML_PROFILE_FILE_OLD L"profile.xml"
#define XML_PROFILE_FILE L"profile." XML_PROFILE_EXT
#define XML_PROFILE_INTERNAL L"profile_internal." XML_PROFILE_EXT
#define XML_PROFILE_INTERNAL L"profile_internal.xml"
#define PROFILE2_ID_PLAIN ((BYTE)(0x30))
#define PROFILE2_ID_COMPRESSED ((BYTE)(0x31))