it out. A line was removed from the scrollback, cleared, and placed
at the bottom of the screen. Fine, except that the clearing process
assumed the line was the right length already, and thanks to lazy
resizing this wasn't necessarily the case. Segfaults and memory
corruption ensued.)
git-svn-id: svn://svn.tartarus.org/sgt/putty@1129
cda61777-01e9-0310-a592-
d414129be87e
static void logtraffic(unsigned char c, int logmode);
/*
static void logtraffic(unsigned char c, int logmode);
/*
+ * Resize a line to make it `cols' columns wide.
+ */
+unsigned long *resizeline(unsigned long *line, int cols)
+{
+ int i, oldlen;
+ unsigned long lineattrs;
+
+ if (line[0] != (unsigned long)cols) {
+ /*
+ * This line is the wrong length, which probably means it
+ * hasn't been accessed since a resize. Resize it now.
+ */
+ oldlen = line[0];
+ lineattrs = line[oldlen + 1];
+ line = srealloc(line, TSIZE * (2 + cols));
+ line[0] = cols;
+ for (i = oldlen; i < cols; i++)
+ line[i + 1] = ERASE_CHAR;
+ line[cols + 1] = lineattrs & LATTR_MODE;
+ }
+
+ return line;
+}
+
+/*
* Retrieve a line of the screen or of the scrollback, according to
* whether the y coordinate is non-negative or negative
* (respectively).
*/
unsigned long *lineptr(int y, int lineno)
{
* Retrieve a line of the screen or of the scrollback, according to
* whether the y coordinate is non-negative or negative
* (respectively).
*/
unsigned long *lineptr(int y, int lineno)
{
- unsigned long *line, lineattrs;
+ unsigned long *line, *newline;
- int i, treeindex, oldlen;
if (y >= 0) {
whichtree = screen;
if (y >= 0) {
whichtree = screen;
/* We assume that we don't screw up and retrieve something out of range. */
assert(line != NULL);
/* We assume that we don't screw up and retrieve something out of range. */
assert(line != NULL);
- if (line[0] != cols) {
- /*
- * This line is the wrong length, which probably means it
- * hasn't been accessed since a resize. Resize it now.
- */
- oldlen = line[0];
- lineattrs = line[oldlen + 1];
+ newline = resizeline(line, cols);
+ if (newline != line) {
delpos234(whichtree, treeindex);
delpos234(whichtree, treeindex);
- line = srealloc(line, TSIZE * (2 + cols));
- line[0] = cols;
- for (i = oldlen; i < cols; i++)
- line[i + 1] = ERASE_CHAR;
- line[cols + 1] = lineattrs & LATTR_MODE;
- addpos234(whichtree, line, treeindex);
+ addpos234(whichtree, newline, treeindex);
if (lines < 0) {
while (lines < 0) {
line = delpos234(screen, botline);
if (lines < 0) {
while (lines < 0) {
line = delpos234(screen, botline);
+ line = resizeline(line, cols);
for (i = 0; i < cols; i++)
line[i + 1] = erase_char;
line[cols + 1] = 0;
for (i = 0; i < cols; i++)
line[i + 1] = erase_char;
line[cols + 1] = 0;
addpos234(scrollback, line, sblen);
line = line2;
}
addpos234(scrollback, line, sblen);
line = line2;
}
+ line = resizeline(line, cols);
for (i = 0; i < cols; i++)
line[i + 1] = erase_char;
line[cols + 1] = 0;
for (i = 0; i < cols; i++)
line[i + 1] = erase_char;
line[cols + 1] = 0;