mirrors/Sandboxie
mirrors
/
Sandboxie
mirror of https://github.com/sandboxie-plus/Sandboxie.git
1
0
Fork 0
Code Releases Activity

Merge pull request #564 from typpos/master 

Fix byte-len vs wchar-len error
This commit is contained in:
DavidXanatos 2021-02-21 12:42:08 +01:00 committed by GitHub
parent 3fbd87def3 76d7f6dbc0
commit 538bbff99a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Sandboxie/apps/control/BoxPage.cpp
View File

@ -966,7 +966,7 @@ void CBoxPage::Appearance_OnOK(CBox &box)
BOOL enable = (pCheckBox3->GetCheck() == BST_CHECKED ? TRUE : FALSE); BOOL enable = (pCheckBox3->GetCheck() == BST_CHECKED ? TRUE : FALSE);
BOOL title = (pCheckBox4->GetCheck() == BST_CHECKED ? TRUE : FALSE); BOOL title = (pCheckBox4->GetCheck() == BST_CHECKED ? TRUE : FALSE);
CString str; CString str;
GetDlgItem(ID_MIGRATE_KB)->GetWindowText(str); GetDlgItem(ID_BORDER_WIDTH)->GetWindowText(str);
int width = _wtoi(str); int width = _wtoi(str);
ok = box.SetBorder(enable, Appearance_BorderColor, title, width); ok = box.SetBorder(enable, Appearance_BorderColor, title, width);
} }

9
Sandboxie/core/drv/session.c
View File

@ -504,7 +504,8 @@ _FX NTSTATUS Session_Api_DisableForce(PROCESS *proc, ULONG64 *parms)
in_flag = args->set_flag.val; in_flag = args->set_flag.val;
if (in_flag) { if (in_flag) {
ProbeForRead(in_flag, sizeof(ULONG), sizeof(ULONG)); ProbeForRead(in_flag, sizeof(ULONG), sizeof(ULONG));
if (*in_flag) { ULONG in_flag_value = *in_flag;
if (in_flag_value) {
if (! Session_CheckAdminAccess(L"ForceDisableAdminOnly")) if (! Session_CheckAdminAccess(L"ForceDisableAdminOnly"))
return STATUS_ACCESS_DENIED; return STATUS_ACCESS_DENIED;
@ -513,7 +514,7 @@ _FX NTSTATUS Session_Api_DisableForce(PROCESS *proc, ULONG64 *parms)
} else } else
time.QuadPart = 0; time.QuadPart = 0;
if (*in_flag == DISABLE_JUST_THIS_PROCESS) { if (in_flag_value == DISABLE_JUST_THIS_PROCESS) {
Process_DfpInsert(PROCESS_TERMINATED, PsGetCurrentProcessId()); Process_DfpInsert(PROCESS_TERMINATED, PsGetCurrentProcessId());
@ -974,11 +975,11 @@ _FX NTSTATUS Session_Api_MonitorGetEx(PROCESS *proc, ULONG64 *parms)
if (log_tid != NULL) if (log_tid != NULL)
ProbeForWrite(log_tid, sizeof(ULONG64), sizeof(ULONG64)); ProbeForWrite(log_tid, sizeof(ULONG64), sizeof(ULONG64));
log_len = args->log_len.val / sizeof(WCHAR); log_len = args->log_len.val / sizeof(WCHAR) * sizeof(WCHAR);
if (!log_len) if (!log_len)
return STATUS_INVALID_PARAMETER; return STATUS_INVALID_PARAMETER;
log_data = args->log_ptr.val; log_data = args->log_ptr.val;
ProbeForWrite(log_data, log_len * sizeof(WCHAR), sizeof(WCHAR)); ProbeForWrite(log_data, log_len, sizeof(WCHAR));
*log_type = 0; *log_type = 0;
if (log_pid != NULL) if (log_pid != NULL)