KolibriOS/kolibrios
13
14
Fork 12
Code Issues 113 Pull Requests 16 Actions Projects 1 Releases Wiki Activity

Boxlib: fix write null pointer in editbox #159

Merged
Sweetbread merged 1 commits from boxlib-fix into main 2025-03-17 11:03:40 +01:00
Conversation 1 Commits 1 Files Changed 1 +9 -3
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
programs/develop/libraries/box_lib/trunk/editbox.asm
View File

@@ -601,6 +601,8 @@ edit_box_mouse:
jnz edit_box_mouse.mouse_left_button
and word ed_flags,ed_mouse_on_off
mov ebx,ed_mouse_variable
or ebx,ebx
jz edit_box_exit
push 0
pop dword [ebx]
jmp edit_box_exit
@@ -610,13 +612,14 @@ edit_box_mouse:
;--- <20><><EFBFBD><EFBFBD><EFBFBD>஢<EFBFBD><E0AEA2> <20><> 䮪<><E4AEAA><EFBFBD>஢<EFBFBD><E0AEA2> <20> <20><>㣨<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
;----------------------------------------------------------
mov eax,ed_mouse_variable
test eax,eax
jz @f ;<3B>᫨ ed_mouse_variable=0
push dword [eax]
pop eax
test eax,eax
jz @f
jz @f ;<3B>᫨ [ed_mouse_variable]=0
cmp eax,edi
je @f
jmp edit_box_mouse._blur
jne edit_box_mouse._blur
;----------------------------------------------------------
;--- <20><><EFBFBD><EFBFBD>砥<EFBFBD> <20><><EFBFBD>न<EFBFBD><E0A4A8><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20>⭮<EFBFBD><E2ADAE>⥫쭮 0 <20>.<2E> <20>ᥩ <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><>࠭<EFBFBD>
;----------------------------------------------------------
@@ -672,8 +675,11 @@ edit_box_mouse._mshift:
or word ed_flags,ed_mouse_on
mov ed_pos,eax
mov ebx,ed_mouse_variable
or ebx,ebx
jz edit_box_mouse.mv_end
push edi
pop dword [ebx]
edit_box_mouse.mv_end:
bts word ed_flags,1
call edit_box_draw.bg
jmp edit_box_mouse.m_sh