mr4th-public
/
4coder
1
Fork 0
Code Issues Releases Activity

limit list index to valid range

master
Allen Webster 2016-05-17 22:46:33 -04:00
parent c989b9dae9
commit 040e81014e
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
4ed_file_view.cpp
View File

@ -1000,7 +1000,7 @@ undo_stack_pop(Edit_Stack *stack){
} }
internal void internal void
file_post_redo(General_Memory *general, Editing_File *file, Edit_Step step){ file_post_redo(General_Memory *general, Editing_File *file, Edit_Step step){
Edit_Stack *redo = &file->state.undo.redo; Edit_Stack *redo = &file->state.undo.redo;
if (step.child_count == 0){ if (step.child_count == 0){
@ -3707,7 +3707,8 @@ step_file_view(System_Functions *system, View *view, View *active_view, Input_Su
if (file_info.name_match){ if (file_info.name_match){
id.id[0] = (u64)(file_info.info); id.id[0] = (u64)(file_info.info);
if (gui_do_file_option(target, id, file_info.info->filename, file_info.is_folder, file_info.message)){ if (gui_do_file_option(target, id, file_info.info->filename,
file_info.is_folder, file_info.message)){
if (file_info.is_folder){ if (file_info.is_folder){
set_last_folder(&hdir->string, file_info.info->filename, '/'); set_last_folder(&hdir->string, file_info.info->filename, '/');
do_new_directory = 1; do_new_directory = 1;

11
4ed_gui.cpp
View File

@ -142,6 +142,7 @@ struct GUI_Target{
GUI_id auto_hot; GUI_id auto_hot;
GUI_id hover; GUI_id hover;
// TODO(allen): Can we remove original yet?
GUI_Scroll_Vars scroll_original; GUI_Scroll_Vars scroll_original;
GUI_Scroll_Vars scroll_updated; GUI_Scroll_Vars scroll_updated;
@ -490,7 +491,15 @@ gui_begin_list(GUI_Target *target, GUI_id id, i32 list_i, b32 activate_item, GUI
} }
if (result){ if (result){
gui_fill_item_update(update, target, h, active); if (list_i < 0){
gui_fill_item_update(update, target, h, active, 0);
}
else if (list_i >= target->list_max){
gui_fill_item_update(update, target, h, active, target->list_max - 1);
}
else{
gui_fill_item_update(update, target, h, active);
}
target->animating = 1; target->animating = 1;
} }