Mercurial > vim
view src/if_perlsfio.c @ 33872:2c5ae1ce5af2 v9.0.2146
patch 9.0.2146: text-property without type errors when joining
Commit: https://github.com/vim/vim/commit/0d0b3b19517c321b089d637919e88e49a07a3d85
Author: Christian Brabandt <cb@256bit.org>
Date: Sun Dec 3 17:56:43 2023 +0100
patch 9.0.2146: text-property without type errors when joining
Problem: text-property without type errors when joining
Solution: count all text-properties, with or without type
before joining lines
Error when joining lines with text properties without a proper type
When joining lines, we need to consider all text properties that are
attached to a line, even when those text properties are invalid and do
not have a type attached to them.
However, since patch v9.0.0993
(commit: 89469d157aea01513bde826b4519dd6b5fbceae4)
those text properties won't be counted when joining lines and therefore
this will cause the adjustment for text properties on joining to go
wrong (and may later cause SIGABRT with an invalid free pointer)
I am not sure, why the condition to not count text properties with a
valid type was added in patch v9.0.993, because no test fails if those
condition is removed. So let's just remove this condition and add a test
that verifies, that we are able to join lines, even when the text
properties attached to it do not have a valid type.
fixes: #13609
closes: #13614
Signed-off-by: Christian Brabandt <cb@256bit.org>
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Sun, 10 Dec 2023 15:16:11 +0100 |
parents | f0f9692d4487 |
children |
line wrap: on
line source
/* vi:set ts=8 sts=4 sw=4 noet: * * VIM - Vi IMproved by Bram Moolenaar * * Do ":help uganda" in Vim to read copying and usage conditions. * Do ":help credits" in Vim to see a list of people who contributed. * See README.txt for an overview of the Vim source code. */ /* * if_perlsfio.c: Special I/O functions for Perl interface. */ #define _memory_h // avoid memset redeclaration #define IN_PERL_FILE // don't include if_perl.pro from prot.h #include "vim.h" #if defined(USE_SFIO) || defined(PROTO) #ifndef USE_SFIO // just generating prototypes # define Sfio_t int # define Sfdisc_t int #endif #define NIL(type) ((type)0) static int sfvimwrite( Sfio_t *f, // stream involved char *buf, // buffer to read from int n, // number of bytes to write Sfdisc_t *disc) // discipline { char_u *str; str = vim_strnsave((char_u *)buf, n); if (str == NULL) return 0; msg_split((char *)str); vim_free(str); return n; } /* * sfdcnewnvi -- * Create Vim discipline */ Sfdisc_t * sfdcnewvim(void) { Sfdisc_t *disc; disc = ALLOC_ONE(Sfdisc_t); if (disc == NULL) return NULL; disc->readf = (Sfread_f)NULL; disc->writef = sfvimwrite; disc->seekf = (Sfseek_f)NULL; disc->exceptf = (Sfexcept_f)NULL; return disc; } #endif // USE_SFIO