erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-08-05 00:15:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merge pull request #1741 from keymanapp/windows-comapi-buffer-overrun-in-getdefaultkeyboardid-64-10.0

Browse source 
[Windows] [10.0] Fix FieldWorks LT-19402, buffer overrun in GetDefaultKeyboardID for 64 bit
This commit is contained in:
Marc Durdin 2019-04-24 15:28:11 +07:00 • committed by GitHub
commit f16872a998
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
windows/src/engine/kmcomapi/util/utilkeyman.pas
View file

@ -57,7 +57,7 @@ function GetKeyboardIconFileName(const KeyboardFileName: string): string; // I
function GetKeymanInstallPath: string;
function GetDefaultHKL: HKL; // I3581 // I3619 // I3619
function GetDefaultKeyboardID: Cardinal; // I4169
function GetDefaultKeyboardID: HKL; // I4169
var
FInstallingKeyman: Boolean = False;
@ -306,7 +306,7 @@ begin
Result := 0;
end;
function GetDefaultKeyboardID: Cardinal; // I4169
function GetDefaultKeyboardID: HKL; // I4169
const
BaseKeyboardID_USEnglish: Integer = $00000409;
begin

4
windows/src/global/delphi/general/klog.pas
View file

@ -60,7 +60,7 @@ implementation
{$IFDEF KLOGGING}
uses
Variants, Windows, SysUtils, ErrorControlledRegistry, SystemDebugPath, VersionInfo, Unicode;
Variants, Windows, SysUtils, ErrorControlledRegistry, ErrLogPath, VersionInfo, Unicode;
{$ENDIF}
@ -91,7 +91,7 @@ var
FRootPath: string;
begin
inherited Create;
FRootPath := GetSystemDebugPath;
FRootPath := GetErrLogPath;
FMethodStack := TStringList.Create;
GetModuleFileName(hInstance, buf, 260); FAppName := buf;