Fix for bugu #54

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@518 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
This commit is contained in:
Chris Allegretta 2001-02-05 13:43:23 +00:00
parent a8785e0793
commit 09f39cbec6
3 changed files with 12 additions and 10 deletions

8
BUGS
View File

@ -94,11 +94,11 @@
browser..) (52) [FIXED]
- Alt speller argument (-s, --speller) does not take a string argument of
more than one word. (53) [FIXED].
- Cut to end cutting (-k) causes segfaults (try cutting "- Backup making
(filename~)?" line in TODO file) (discovred by
higuita@cadernoverde.com) (54) [FIXED].
** Open BUGS **
$Id$
- Cut to end cutting (-k) causes segfaults (try cutting "- Backup making
(filename~)?" line in TODO file) (discovred by
higuita@cadernoverde.com) (54).

View File

@ -1,6 +1,9 @@
CVS code -
- configure.in:
- Autoconf compatibility fixes (Pavel Roskin)
- cut.c:
do_cut_text()
- marked text cut fixes (Rocco) (Fixes bug #54).
nano-0.9.99pre2 - 01/31/2001
General

11
cut.c
View File

@ -174,24 +174,23 @@ int do_cut_text(void)
if (ISSET(MARK_ISSET)) {
if (current->lineno == mark_beginbuf->lineno) {
tmp = copy_node(current);
newsize = abs(strlen(&current->data[mark_beginx]) -
strlen(&current->data[current_x]));
newsize = abs(mark_beginx - current_x) + 1;
tmpstr = nmalloc(newsize);
tmpstr = nmalloc(newsize + 1);
if (current_x < mark_beginx) {
strncpy(tmpstr, &current->data[current_x], newsize);
memmove(&current->data[current_x],
&current->data[mark_beginx],
strlen(&current->data[mark_beginx] - newsize));
strlen(&current->data[mark_beginx]) + 1);
} else {
strncpy(tmpstr, &current->data[mark_beginx], newsize);
memmove(&current->data[mark_beginx],
&current->data[current_x],
strlen(&current->data[current_x] - newsize));
strlen(&current->data[current_x]) + 1);
current_x = mark_beginx;
update_cursor();
}
tmpstr[newsize] = 0;
tmpstr[newsize - 1] = 0;
tmp->data = tmpstr;
add_to_cutbuffer(tmp);
dump_buffer(cutbuffer);