CodeCow/Notepad3
1
0
Fork 0
mirror of https://github.com/rizonesoft/Notepad3.git synced 2026-06-14 21:09:05 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #2727 from RaiKoHoff/Dev_NewFeatures

Browse Source 
Extend buffer in case of auto-esc control chars in find/replace edit control
This commit is contained in:
Pairi Daiza 2020-08-29 09:32:45 +02:00 committed by GitHub
commit f2cf144473
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Edit.c
View File

@ -5966,16 +5966,17 @@ static INT_PTR CALLBACK EditFindReplaceDlgProc(HWND hwnd,UINT umsg,WPARAM wParam
DocPos const cchSelection = SciCall_GetSelText(NULL);
if ((1 < cchSelection) && (LOWORD(wParam) != IDC_REPLACETEXT)) {
lpszSelection = AllocMem(cchSelection + 1, HEAP_ZERO_MEMORY);
if (sg_pefrData->bAutoEscCtrlChars) {
lpszSelection = AllocMem((cchSelection<<1) + 1, HEAP_ZERO_MEMORY);
char* buf = AllocMem(cchSelection + 1, HEAP_ZERO_MEMORY);
if (buf) {
SciCall_GetSelText(buf);
SlashA(lpszSelection, cchSelection, buf);
SlashA(lpszSelection, (cchSelection<<1), buf);
FreeMem(buf);
}
}
else {
lpszSelection = AllocMem(cchSelection + 1, HEAP_ZERO_MEMORY);
SciCall_GetSelText(lpszSelection);
}
}
@ -5993,11 +5994,12 @@ static INT_PTR CALLBACK EditFindReplaceDlgProc(HWND hwnd,UINT umsg,WPARAM wParam
if (pClip) {
size_t const len = StringCchLenA(pClip, 0);
if (len) {
lpszSelection = AllocMem(len + 1, HEAP_ZERO_MEMORY);
if (sg_pefrData->bAutoEscCtrlChars) {
SlashA(lpszSelection, len + 1, pClip);
lpszSelection = AllocMem((len<<1) + 1, HEAP_ZERO_MEMORY);
SlashA(lpszSelection, (len<<1) + 1, pClip);
}
else {
lpszSelection = AllocMem(len + 1, HEAP_ZERO_MEMORY);
StringCchCopyA(lpszSelection, len + 1, pClip);
}
}