erabo/spiegel-keyman
1
0
Fork 0
mirror of https://github.com/keymanapp/keyman.git synced 2026-09-16 12:47:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 13

Merge pull request #6965 from keymanapp/fix/linux/6930-gcc12

Browse source 
fix(common): Fix `delete`
This commit is contained in:
Eberhard Beilharz 2022-07-19 08:57:39 +02:00 • committed by GitHub
commit bd4659600a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
core/src/kmx/kmx_file.cpp
View file

@ -183,7 +183,7 @@ KMX_BOOL KMX_ProcessEvent::LoadKeyboard(km_kbp_path_name fileName, LPKEYBOARD *l
if(*PKMX_DWORD(filebase) != KMX_DWORD(FILEID_COMPILED))
{
delete buf;
delete [] buf;
DebugLog("Invalid file - signature is invalid");
return FALSE;
}
@ -198,7 +198,11 @@ KMX_BOOL KMX_ProcessEvent::LoadKeyboard(km_kbp_path_name fileName, LPKEYBOARD *l
if(!kbp) return FALSE;
if(kbp->dwIdentifier != FILEID_COMPILED) { delete buf; DebugLog("errNotFileID"); return FALSE; }
if(kbp->dwIdentifier != FILEID_COMPILED) {
delete [] buf;
DebugLog("errNotFileID");
return FALSE;
}
*lpKeyboard = kbp;

6
core/src/kmx/kmx_options.cpp
View file

@ -118,7 +118,7 @@ KMX_Options::~KMX_Options()
if(_kp->KeyboardOptions[i].Value)
{
_kp->Keyboard->dpStoreArray[i].dpString = _kp->KeyboardOptions[i].OriginalStore;
delete _kp->KeyboardOptions[i].Value;
delete [] _kp->KeyboardOptions[i].Value;
}
delete _kp->KeyboardOptions;
_kp->KeyboardOptions = NULL;
@ -147,7 +147,7 @@ void KMX_Options::Set(int nStoreToSet, std::u16string const & rValueToSet)
auto & rStoreToSetValue = _kp->KeyboardOptions[nStoreToSet].Value;
if(rStoreToSetValue)
{
delete rStoreToSetValue;
delete [] rStoreToSetValue;
}
if(m_debug_items) {
@ -187,7 +187,7 @@ void KMX_Options::Reset(abstract_processor & ap, int nStoreToReset)
if (rOptionToReset.Value)
{
rStoreToReset.dpString = rOptionToReset.OriginalStore;
delete rOptionToReset.Value;
delete [] rOptionToReset.Value;
rOptionToReset.Value = nullptr;
}