fly/flightgear
1
0
Fork 0
Code Activity

Modified Files:

Browse source 
src/Cockpit/hud.cxx src/Cockpit/hud.hxx
	src/Cockpit/hud_labl.cxx src/Instrumentation/HUD/HUD_label.cxx:
	Olaf Flebbe: avoid potential buffer overflows.
This commit is contained in:
frohlich 2007-01-22 05:46:51 +00:00
parent a498181ac1
commit 52645efa60
4 changed files with 56 additions and 85 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Cockpit/hud.cxx
View file

@ -553,7 +553,7 @@ void fgTextList::draw()
Font->begin(); Font->begin();
for (; curString != lastString; curString++) for (; curString != lastString; curString++)
curString->Draw(Font,curString->digit); curString->Draw(Font);
Font->end(); Font->end();
glDisable(GL_TEXTURE_2D); glDisable(GL_TEXTURE_2D);

93
src/Cockpit/hud.hxx
View file

@ -233,26 +233,22 @@ extern float HUD_matrix[16];
class fgText { class fgText {
private: private:
float x, y; float x, y;
char msg[64]; string msg;
bool digit;
// seems unused
public: public:
int digit; fgText(float x, float y, const string& c, bool digits=false): x(x), y(y), msg( c), digit( digits) {};
fgText(float x = 0, float y = 0, char *c = NULL,int digits=0): x(x), y(y)
{
strcpy(msg,c);
digit=digits;
}
fgText( const fgText & image ) fgText( const fgText & image )
: x(image.x), y(image.y),digit(image.digit) { strcpy(msg,image.msg); } : x(image.x), y(image.y),digit(image.digit), msg( image.msg) { }
fgText& operator = ( const fgText & image ) { // seems unused fgText& operator = ( const fgText & image ) {
strcpy(msg,image.msg); x = image.x; y = image.y;digit=image.digit; x = image.x; y = image.y; msg= image.msg; digit = image.digit;
return *this; return *this;
} }
~fgText() { msg[0]='\0'; } // used but useless static int getStringWidth ( const char *str )
int getStringWidth ( char *str )
{ {
if ( HUDtext && str ) { if ( HUDtext && str ) {
float r, l ; float r, l ;
@ -262,11 +258,11 @@ public:
return 0 ; return 0 ;
} }
int StringWidth (void ) int StringWidth ()
{ {
if ( HUDtext && strlen( msg )) { if ( HUDtext && msg != "") {
float r, l ; float r, l ;
HUD_Font->getBBox ( msg, HUD_TextSize, 0, &l, &r, NULL, NULL ) ; HUD_Font->getBBox ( msg.c_str(), HUD_TextSize, 0, &l, &r, NULL, NULL ) ;
return float_to_int( r - l ); return float_to_int( r - l );
} }
return 0 ; return 0 ;
@ -276,56 +272,50 @@ public:
// according to MIL Standards for example Altitude above 10000 ft // according to MIL Standards for example Altitude above 10000 ft
// is shown as 10ooo. // is shown as 10ooo.
void Draw(fntRenderer *fnt,int digits) { void Draw(fntRenderer *fnt) {
if (digits==1) { if (digit) {
int c=0,i=0; int c=0,i=0;
char *t=msg;
int p=4; int p=4;
if (t[0]=='-') { if (msg[0]=='-') {
//if negative value then increase the c and p values //if negative value then increase the c and p values
//for '-' sign. c++; //for '-' sign. c++;
p++; p++;
} }
char *tmp=msg;
while (tmp[i]!='\0') { for (string::size_type i = 0; i < msg.size(); i++) {
if ((tmp[i]>='0') && (tmp[i]<='9')) if ((msg[i]>='0') && (msg[i]<='9'))
c++; c++;
i++;
} }
float orig_size = fnt->getPointSize(); float orig_size = fnt->getPointSize();
if (c>p) { if (c>p) {
fnt->setPointSize(HUD_TextSize * 0.8); fnt->setPointSize(HUD_TextSize * 0.8);
int p1=c-3; int p2=(c-3)*8; //advance to the last 3 digits
char *tmp1=msg+p1;
int p2=p1*8;
fnt->start2f(x+p2,y); fnt->start2f(x+p2,y);
fnt->puts(tmp1); fnt->puts(msg.c_str() + c - 3); // display last 3 digits
fnt->setPointSize(HUD_TextSize * 1.2); fnt->setPointSize(HUD_TextSize * 1.2);
char tmp2[64];
strncpy(tmp2,msg,p1);
tmp2[p1]='\0';
fnt->start2f(x,y); fnt->start2f(x,y);
fnt->puts(tmp2); fnt->puts(msg.substr(0,c-3).c_str());
} else { } else {
fnt->setPointSize(HUD_TextSize * 1.2); fnt->setPointSize(HUD_TextSize * 1.2);
fnt->start2f( x, y ); fnt->start2f( x, y );
fnt->puts(tmp); fnt->puts(msg.c_str());
} }
fnt->setPointSize(orig_size); fnt->setPointSize(orig_size);
} else { } else {
//if digits not equal to 1 //if digits not true
fnt->start2f( x, y ); fnt->start2f( x, y );
fnt->puts( msg ) ; fnt->puts( msg.c_str()) ;
} }
} }
void Draw() void Draw()
{ {
guiFnt.drawString( msg, float_to_int(x), float_to_int(y) ); guiFnt.drawString( msg.c_str(), float_to_int(x), float_to_int(y) );
} }
}; };
@ -334,7 +324,7 @@ class fgLineList {
public: public:
fgLineList( void ) {} fgLineList( void ) {}
void add( const fgLineSeg2D& seg ) { List.push_back(seg); } void add( const fgLineSeg2D& seg ) { List.push_back(seg); }
void erase( void ) { List.erase( List.begin(), List.end() ); } void erase( void ) { List.clear();}
void draw( void ) { void draw( void ) {
glBegin(GL_LINES); glBegin(GL_LINES);
for_each( List.begin(), List.end(), DrawLineSeg2D()); for_each( List.begin(), List.end(), DrawLineSeg2D());
@ -350,7 +340,7 @@ public:
void setFont( fntRenderer *Renderer ) { Font = Renderer; } void setFont( fntRenderer *Renderer ) { Font = Renderer; }
void add( const fgText& String ) { List.push_back(String); } void add( const fgText& String ) { List.push_back(String); }
void erase( void ) { List.erase( List.begin(), List.end() ); } void erase( void ) { List.clear(); }
void draw( void ); void draw( void );
}; };
@ -452,7 +442,7 @@ public:
{ {
HUD_StippleLineList.add(fgLineSeg2D(x1,y1,x2,y2)); HUD_StippleLineList.add(fgLineSeg2D(x1,y1,x2,y2));
} }
void TextString( char *msg, float x, float y,int digit ) void TextString( char *msg, float x, float y, bool digit )
{ {
HUD_TextList.add(fgText(x, y, msg,digit)); HUD_TextList.add(fgText(x, y, msg,digit));
} }
@ -466,17 +456,7 @@ public:
return 0 ; return 0 ;
} }
//code to draw ticks as small circles
void drawOneCircle(float x1, float y1, float r)
{
glBegin(GL_LINE_LOOP); // Use polygon to approximate a circle
for (int count=0; count<25; count++) {
float cosine = r * cos(count * 2 * SG_PI/10.0);
float sine = r * sin(count * 2 * SG_PI/10.0);
glVertex2f(cosine+x1, sine+y1);
}
glEnd();
}
}; };
@ -501,12 +481,11 @@ extern int HUD_style;
class instr_label : public instr_item { class instr_label : public instr_item {
private: private:
const char *pformat; const char *pformat;
const char *pre_str;
const char *post_str;
fgLabelJust justify; fgLabelJust justify;
int fontSize; int fontSize;
int blink; int blink;
char format_buffer[80]; string format_buffer;
bool lat; bool lat;
bool lon; bool lon;
bool lbox; bool lbox;

43
src/Cockpit/hud_labl.cxx
View file

@ -25,8 +25,6 @@ instr_label::instr_label(const SGPropertyNode *node) :
node->getBoolValue("working", true), node->getBoolValue("working", true),
node->getIntValue("digits")), node->getIntValue("digits")),
pformat(node->getStringValue("label_format")), pformat(node->getStringValue("label_format")),
pre_str(node->getStringValue("pre_label_string")),
post_str(node->getStringValue("post_label_string")),
fontSize(fgGetInt("/sim/startup/xsize") > 1000 ? HUD_FONT_LARGE : HUD_FONT_SMALL), // FIXME fontSize(fgGetInt("/sim/startup/xsize") > 1000 ? HUD_FONT_LARGE : HUD_FONT_SMALL), // FIXME
blink(node->getIntValue("blinking")), blink(node->getIntValue("blinking")),
lat(node->getBoolValue("latitude", false)), lat(node->getBoolValue("latitude", false)),
@ -48,32 +46,24 @@ instr_label::instr_label(const SGPropertyNode *node) :
else if (just == 2) else if (just == 2)
justify = RIGHT_JUST; justify = RIGHT_JUST;
if (!strcmp(pre_str, "NULL")) string pre_str(node->getStringValue("pre_label_string"));
pre_str = NULL; if (pre_str== "NULL")
else if (!strcmp(pre_str, "blank")) pre_str.clear();
else if (pre_str == "blank")
pre_str = " "; pre_str = " ";
const char *units = strcmp(fgGetString("/sim/startup/units"), "feet") ? " m" : " ft"; // FIXME const char *units = strcmp(fgGetString("/sim/startup/units"), "feet") ? " m" : " ft"; // FIXME
if (!strcmp(post_str, "blank")) string post_str(node->getStringValue("post_label_string"));
if (post_str== "NULL")
post_str.clear();
else if (post_str == "blank")
post_str = " "; post_str = " ";
else if (!strcmp(post_str, "NULL")) else if (post_str == "units")
post_str = NULL;
else if (!strcmp(post_str, "units"))
post_str = units; post_str = units;
format_buffer = pre_str + pformat;
if (pre_str != NULL) { format_buffer += post_str;
if (post_str != NULL)
sprintf(format_buffer, "%s%s%s", pre_str, pformat, post_str);
else
sprintf(format_buffer, "%s%s", pre_str, pformat);
} else if (post_str != NULL) {
sprintf(format_buffer, "%s%s", pformat, post_str);
} else {
strcpy(format_buffer, pformat); // FIXME
}
} }
@ -84,11 +74,12 @@ void instr_label::draw(void)
int lenstr; int lenstr;
RECT scrn_rect = get_location(); RECT scrn_rect = get_location();
memset( label_buffer, 0, sizeof( label_buffer));
if (data_available()) { if (data_available()) {
if (lat) if (lat)
snprintf(label_buffer, 80, format_buffer, lat_node->getStringValue()); snprintf(label_buffer, sizeof( label_buffer)-1, format_buffer.c_str(), lat_node->getStringValue());
else if (lon) else if (lon)
snprintf(label_buffer, 80, format_buffer, lon_node->getStringValue()); snprintf(label_buffer, sizeof( label_buffer)-1, format_buffer.c_str(), lon_node->getStringValue());
else { else {
if (lbox) {// Box for label if (lbox) {// Box for label
float x = scrn_rect.left; float x = scrn_rect.left;
@ -119,11 +110,11 @@ void instr_label::draw(void)
glDisable(GL_LINE_STIPPLE); glDisable(GL_LINE_STIPPLE);
glPopMatrix(); glPopMatrix();
} }
sprintf(label_buffer, format_buffer, get_value() * data_scaling()); snprintf(label_buffer, sizeof(label_buffer)-1, format_buffer.c_str(), get_value() * data_scaling());
} }
} else { } else {
sprintf(label_buffer, format_buffer); snprintf(label_buffer, sizeof( label_buffer) -1, format_buffer.c_str());
} }
lenstr = getStringWidth(label_buffer); lenstr = getStringWidth(label_buffer);

3
src/Instrumentation/HUD/HUD_label.cxx
View file

@ -142,7 +142,8 @@ void HUD::Label::draw(void)
} }
const int BUFSIZE = 256; const int BUFSIZE = 256;
char buf[BUFSIZE]; char buf[BUFSIZE+1];
buf[ BUFSIZE] = '\0'; // Be sure to terminate properly
if (_mode == NONE) if (_mode == NONE)
snprintf(buf, BUFSIZE, _format.c_str()); snprintf(buf, BUFSIZE, _format.c_str());
else if (_mode == STRING) else if (_mode == STRING)