Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

From OpenBSD: 

revision 1.7
date: 2004/04/08 15:18:28;  author: millert;  state: Exp;  lines: +5 -7
When reallocating the line buffer, double the existing buffer
size instead of just incrementing it by LINEBUF_SIZE and use realloc()
+ memset() instead of calloc() + memcpy().  Prevents excessive resource
usage when displaying very long lines.  OK deraadt@, krw@ and otto@

Ok'd by mrg.
This commit is contained in:
wiz 2004-08-26 01:29:20 +00:00
parent c648671766
commit 0c3e116cc5
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
usr.bin/less/less/line.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: line.c,v 1.8 2003/04/14 02:56:47 mrg Exp $ */
/* $NetBSD: line.c,v 1.9 2004/08/26 01:29:20 wiz Exp $ */
/*
* Copyright (C) 1984-2002 Mark Nudelman
@ -86,9 +86,9 @@ init_line()
static int
expand_linebuf()
{
int new_size = size_linebuf + LINEBUF_SIZE;
char *new_buf = (char *) calloc(new_size, sizeof(char));
char *new_attr = (char *) calloc(new_size, sizeof(char));
int new_size = size_linebuf * 2;
char *new_buf = (char *) realloc(linebuf, new_size);
char *new_attr = (char *) realloc(attr, new_size);
if (new_buf == NULL || new_attr == NULL)
{
if (new_attr != NULL)
@ -97,10 +97,8 @@ expand_linebuf()
free(new_buf);
return 1;
}
memcpy(new_buf, linebuf, size_linebuf * sizeof(char));
memcpy(new_attr, attr, size_linebuf * sizeof(char));
free(attr);
free(linebuf);
memset(new_buf + size_linebuf, 0, new_size - size_linebuf);
memset(new_attr + size_linebuf, 0, new_size - size_linebuf);
linebuf = new_buf;
attr = new_attr;
size_linebuf = new_size;