Chameleon Commit Details - 1401 - Chameleon open source boot loader project.

Date:

2011-08-16 07:00:13 (12 years 8 months ago)

Author:

Evan Lojewski

Commit:

1401

Parents:

1400

Message:

Cause showInfoBox to verify bounds before wriging to memory. Fixes corruption issue #66. Note: currently truncates long strings.

Changes:

M	/trunk/i386/boot2/gui.c

File differences

-1305
1306 1306
1307 1307
1308 
1308
1309 1309
1310 1310
1311 1311
+␉␉if( ch[i] == '\t' )␊
␉␉␉x+=(font->chars[0]->width*5);␊
␉␉␊
␉␉if(font->chars[cha])␊
␉␉if(font->chars[cha] && ((x + font->chars[cha]->width) < blendInto->width))␊
␉␉␉blend(font->chars[cha], blendInto, pos(p.x+x, p.y+y));␊
␉␉␊
␉␉x += font->chars[cha]->width;␊
 ␉␉if( ch[i] == '\t' )␊
 ␉␉␉x+=(font->chars[0]->width*5);␊
 ␉␉␊
-␉␉if(font->chars[cha])␊
+␉␉if(font->chars[cha] && ((x + font->chars[cha]->width) < blendInto->width))␊
 ␉␉␉blend(font->chars[cha], blendInto, pos(p.x+x, p.y+y));␊
 ␉␉␊
 ␉␉x += font->chars[cha]->width;␊