procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* editfns.c: Tune. Don't use wider integers than needed. Don't use alloca.

Browse source 
Use a bigger 'string' buffer.  Rewrite to avoid 'n > 0' test.
This commit is contained in:
Paul Eggert 2011-06-16 10:44:43 -07:00
parent 2e6813b0a5
commit 21d890a4ec
2 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/ChangeLog
View file

@ -1,6 +1,8 @@
2011-06-16 Paul Eggert <eggert@cs.ucla.edu>
* editfns.c (Finsert_char): Don't dump core with very negative counts.
Tune. Don't use wider integers than needed. Don't use alloca.
Use a bigger 'string' buffer. Rewrite to avoid 'n > 0' test.
* insdel.c (replace_range): Fix buf overflow when insbytes < outgoing.

21
src/editfns.c
View file

@ -2328,12 +2328,11 @@ The optional third arg INHERIT, if non-nil, says to inherit text properties
from adjoining text, if those properties are sticky. */)
(Lisp_Object character, Lisp_Object count, Lisp_Object inherit)
{
register char *string;
register EMACS_INT stringlen;
register int i;
int i, stringlen;
register EMACS_INT n;
int c, len;
unsigned char str[MAX_MULTIBYTE_LENGTH];
char string[4000];
CHECK_CHARACTER (character);
CHECK_NUMBER (count);
@ -2348,11 +2347,10 @@ from adjoining text, if those properties are sticky. */)
if (BUF_BYTES_MAX / len < XINT (count))
buffer_overflow ();
n = XINT (count) * len;
stringlen = min (n, 256 * len);
string = (char *) alloca (stringlen);
stringlen = min (n, sizeof string - sizeof string % len);
for (i = 0; i < stringlen; i++)
string[i] = str[i % len];
while (n >= stringlen)
while (n > stringlen)
{
QUIT;
if (!NILP (inherit))
@ -2361,13 +2359,10 @@ from adjoining text, if those properties are sticky. */)
insert (string, stringlen);
n -= stringlen;
}
if (n > 0)
{
if (!NILP (inherit))
insert_and_inherit (string, n);
else
insert (string, n);
}
if (!NILP (inherit))
insert_and_inherit (string, n);
else
insert (string, n);
return Qnil;
}