in do_replace_loop(), fix problem where replacing e.g. single-byte

characters with multibyte ones could result in openfile->totsize's being
miscalculated

git-svn-id: svn://svn.savannah.gnu.org/nano/branches/nano_2_0_branch/nano@4130 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

diff --git a/ChangeLog b/ChangeLog
index 9e08a0d16810cfe015ca77f68bff62966ab277d3..fbc52ba56ab1d2c8b8af99bd79048e348c43b787 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -24,6 +24,11 @@ CVS code -
 - prompt.c:
   do_yesno_prompt()
        - Remove redundant check for NO_HELP's being FALSE. (DLR)
+- search.c:
+  do_replace_loop()
+       - Fix problem where replacing e.g. single-byte characters with
+         multibyte ones could result in openfile->totsize's being
+         miscalculated. (DLR)
 - winio.c:
   get_key_buffer()
        - Fix inaccurate comments. (DLR)

diff --git a/src/search.c b/src/search.c
index a1e5d644e0c162b43ced2c8a8f2fd84f927501f3..4761623d2a9881300d8c971096b08d5bbcd5fd7d 100644 (file)
--- a/src/search.c
+++ b/src/search.c
@@ -827,7 +827,8 @@ ssize_t do_replace_loop(
                openfile->current_x += match_len + length_change - 1;
 
            /* Cleanup. */
-           openfile->totsize += length_change;
+           openfile->totsize += mbstrlen(copy) -
+               mbstrlen(openfile->current->data);
            free(openfile->current->data);
            openfile->current->data = copy;