aniani/elinks
1
0
Fork 0
mirror of https://github.com/rkd77/elinks.git synced 2024-12-04 14:46:47 -05:00
Code

Bug 912, set_hline: Don't let LINE(y).length remain larger than needed.

Browse Source
This commit is contained in:
Kalle Olavi Niemitalo 2006-12-26 14:51:42 +02:00 committed by Kalle Olavi Niemitalo
parent 26cce9aab3
commit cd10da6f31
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/document/html/renderer.c
View File

@ -396,6 +396,7 @@ set_hline(struct html_context *html_context, unsigned char *chars, int charslen,
const int x2 = x; const int x2 = x;
int len = charslen; int len = charslen;
const int utf8 = html_context->options->utf8; const int utf8 = html_context->options->utf8;
int orig_length;
assert(part); assert(part);
if_assert_failed return len; if_assert_failed return len;
@ -418,8 +419,9 @@ set_hline(struct html_context *html_context, unsigned char *chars, int charslen,
* incomplete character in part->document->buf, then * incomplete character in part->document->buf, then
* the first byte of input can result in a double-cell * the first byte of input can result in a double-cell
* character, so we must reserve one extra element. */ * character, so we must reserve one extra element. */
if (realloc_line(html_context, part->document, orig_length = realloc_line(html_context, part->document,
Y(y), X(x) + charslen) < 0) Y(y), X(x) + charslen);
if (orig_length < 0) /* error */
return 0; return 0;
if (utf8) { if (utf8) {
unsigned char *end = chars + charslen; unsigned char *end = chars + charslen;
@ -442,6 +444,7 @@ set_hline(struct html_context *html_context, unsigned char *chars, int charslen,
goto good_char; goto good_char;
} else { } else {
/* Still not full char */ /* Still not full char */
LINE(y).length = orig_length;
return 0; return 0;
} }
} }
@ -513,6 +516,13 @@ good_char:
* before each @copy_screen_chars call above, but * before each @copy_screen_chars call above, but
* those are in an inner loop that should be fast. */ * those are in an inner loop that should be fast. */
assert(X(x) <= LINE(y).length); assert(X(x) <= LINE(y).length);
/* Some part of the code is apparently using LINE(y).length
* for line-wrapping decisions. It may currently be too
* large because it was allocated above based on @charslen
* which is the number of bytes, not the number of cells.
* Change the length to the correct size, but dont let it
* get smaller than it was on entry to this function. */
LINE(y).length = int_max(orig_length, X(x));
len = x - x2; len = x - x2;
} else { } else {
if (utf8) { if (utf8) {