Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-26 22:32:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Patch submitted by Chris Siegler (siegler@citilink.com). Checks for an

Browse Source 
error case in layout of formatted and preformatted text and aborts early.
Fixes a crash on resizing of pages with preformatted text inside tables.
This commit is contained in:
nisheeth%netscape.com 1998-10-17 00:42:30 +00:00
parent 9fb22bd084
commit 6110735e63
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/layout/laytext.c
View File

@ -1825,11 +1825,12 @@ lo_LayoutPreformattedText(MWContext *context,
int kinsoku_class, last_kinsoku_class;
int i;
int bytestocopy;
char * text;
char * text = NULL;
Bool lineBufMeasured;
/* start at the current text position in this text block */
text = (char *) &block->text_buffer[ block->buffer_read_index ];
/* start at the current text position in this text block */
if (block->text_buffer)
text = (char *) &block->text_buffer[ block->buffer_read_index ];
kinsoku_class = PROHIBIT_NOWHERE;
@ -1848,6 +1849,7 @@ lo_LayoutPreformattedText(MWContext *context,
return;
}
charset = block->text_attr->charset;
multi_byte = (INTL_CharSetType(charset) != SINGLEBYTE);
@ -2542,11 +2544,7 @@ lo_LayoutFormattedText(MWContext *context,
int16 charset;
Bool multi_byte;
LO_TextStruct text_data;
char * text;
/* start at the current text position in this text block */
text = (char *) &block->text_buffer[ block->buffer_read_index ];
char * text = NULL;
#ifdef XP_OS2 /* performance */
int32 maxw; /* performance - max char width for font */
@ -2554,8 +2552,11 @@ lo_LayoutFormattedText(MWContext *context,
int textsw; /* performance */
maxw = 0;
textsw = 0; /* performance - need to mark no width taken */
#endif
#endif
/* start at the current text position in this text block */
if (block->text_buffer)
text = (char *) &block->text_buffer[ block->buffer_read_index ];
/*
* Initialize the structures to 0 (mark)