7e5a816749
Firstly, lots of places in editor(1) would do a move from (x₀,y₀) to (x,y) by first moving to (x,y₀) or (x₀,y) and only then (x,y). If the intermediate positions were not valid cursor positions, this might cause out of bounds access. Categorically fixed this by removing functions for moving only horizontally or only vertically. Secondly, editor_select_set() would set the column before setting the line. Since the code for setting the column accesses the currently set line at the new cursor position, it might cause out of bounds access even on valid cursor positions. Fixed this by swapping the order in which column and row are set. Thirdly, the order of arguments passed to row_column_smallest() and row_column_biggest() was wrong, with column being passed before the row, even though they were defined the other way. However, this did not result in out of bounds memory accesses due to the parameters to editor_cursor_set() also being swapped at relevant callsites. Finally, the boundary condition for control-down was off by one.
31 lines
1 KiB
C
31 lines
1 KiB
C
/*
|
|
* Copyright (c) 2013, 2014 Jonas 'Sortie' Termansen.
|
|
*
|
|
* Permission to use, copy, modify, and distribute this software for any
|
|
* purpose with or without fee is hereby granted, provided that the above
|
|
* copyright notice and this permission notice appear in all copies.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
|
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
|
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
|
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
|
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
|
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
|
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
|
*
|
|
* cursor.h
|
|
* Editor cursor.
|
|
*/
|
|
|
|
#ifndef EDITOR_CURSOR_H
|
|
#define EDITOR_CURSOR_H
|
|
|
|
#include <stddef.h>
|
|
|
|
struct editor;
|
|
|
|
void editor_select_set(struct editor* editor, size_t y, size_t x);
|
|
void editor_cursor_set(struct editor* editor, size_t y, size_t x);
|
|
|
|
#endif
|