Merge lp:~vitty/armagetronad/trunk-armagetronad-verify_color_code into lp:~armagetronad-dev/armagetronad/trunk-armagetronad-work

[Vitty]

Verify the color code.
 - This prevents a segfault when a color code can be too
   short and it tries to use a UTF character to complete it.

[Manuel Moos (z-man)]

Good work.

review: Approve

=== modified file 'src/render/rFont.cpp'
--- src/render/rFont.cpp	2009-01-31 20:20:16 +0000
+++ src/render/rFont.cpp	2011-07-11 02:50:59 +0000
@@ -617,21 +617,23 @@
         //}
 
         // detect presence of color code
-        if (*c=='0' && my_strnlen(c, 8)>=8 && c[1]=='x' && colorMode != COLOR_IGNORE )
+
+        FTGL_CHAR const resett[] = {
+                                     static_cast<FTGL_CHAR>('0'),
+                                     static_cast<FTGL_CHAR>('x'),
+                                     static_cast<FTGL_CHAR>('R'),
+                                     static_cast<FTGL_CHAR>('E'),
+                                     static_cast<FTGL_CHAR>('S'),
+                                     static_cast<FTGL_CHAR>('E'),
+                                     static_cast<FTGL_CHAR>('T'),
+                                     static_cast<FTGL_CHAR>('T'),
+                                     0};
+
+        if (*c=='0' && my_strnlen(c, 8)>=8 && c[1]=='x' && colorMode != COLOR_IGNORE && (tColor::VerifyColorCode(c) || 0 == my_strncmp(c,resett,8)))
         {
             tColor color;
             bool use = false;
 
-            FTGL_CHAR const resett[] = {
-                                         static_cast<FTGL_CHAR>('0'),
-                                         static_cast<FTGL_CHAR>('x'),
-                                         static_cast<FTGL_CHAR>('R'),
-                                         static_cast<FTGL_CHAR>('E'),
-                                         static_cast<FTGL_CHAR>('S'),
-                                         static_cast<FTGL_CHAR>('E'),
-                                         static_cast<FTGL_CHAR>('T'),
-                                         static_cast<FTGL_CHAR>('T'),
-                                         0};
             if ( 0 == my_strncmp(c,resett,8) )
             {
                 // color reset to default requested

=== modified file 'src/tools/tColor.cpp'
--- src/tools/tColor.cpp	2009-02-02 16:15:01 +0000
+++ src/tools/tColor.cpp	2011-07-11 02:50:59 +0000
@@ -147,14 +147,11 @@
 
 void tColor::FillFrom( const char * c )
 {
-    // check whether the passed string is too short
-    for( int i = 0; i < 8; ++i )
+    // Verify it's a valid color code
+    if( !VerifyColorCode( c ) )
     {
-        if( !c[i] )
-        {
-            r_ = g_ = b_ = 0;
-            return;
-        }
+        r_ = g_ = b_ = 0;
+        return;
     }
 
     r_ = CTR( hex_to_int( c[2] ) *16 + hex_to_int( c[3] ) );
@@ -174,14 +171,11 @@
 
 void tColor::FillFrom( const wchar_t * c )
 {
-    // check whether the passed string is too short
-    for( int i = 0; i < 8; ++i )
+    // Verify it's a valid color code
+    if( !VerifyColorCode( c ) )
     {
-        if( !c[i] )
-        {
-            r_ = g_ = b_ = 0;
-            return;
-        }
+        r_ = g_ = b_ = 0;
+        return;
     }
 
     r_ = CTR( hex_to_int( c[2] ) *16 + hex_to_int( c[3] ) );
@@ -225,6 +219,54 @@
 
 // *******************************************************************************************
 // *
+// *	VerifyColorCode
+// *
+// *******************************************************************************************
+//!
+//!		@param	c	Color code string to read the color from
+//!
+// *******************************************************************************************
+
+bool tColor::VerifyColorCode( const char * c )
+{
+    for( int i = 2; i < 8; ++i )
+    {
+        if ( !c[i] ||
+             (!(c[i] >= '0' && c[i] <= '9') &&
+              !(c[i] >= 'A' && c[i] <= 'F') &&
+              !(c[i] >= 'a' && c[i] <= 'f')
+             )
+           ) return false;
+    }
+    return true;
+}
+
+// *******************************************************************************************
+// *
+// *	VerifyColorCode
+// *
+// *******************************************************************************************
+//!
+//!		@param	c	Color code string to read the color from
+//!
+// *******************************************************************************************
+
+bool tColor::VerifyColorCode( const wchar_t * c )
+{
+    for( int i = 2; i < 8; ++i )
+    {
+        if ( !c[i] ||
+             (!(c[i] >= '0' && c[i] <= '9') &&
+              !(c[i] >= 'A' && c[i] <= 'F') &&
+              !(c[i] >= 'a' && c[i] <= 'f')
+             )
+           ) return false;
+    }
+    return true;
+}
+
+// *******************************************************************************************
+// *
 // *	tColor
 // *
 // *******************************************************************************************

=== modified file 'src/tools/tColor.h'
--- src/tools/tColor.h	2010-08-06 07:05:46 +0000
+++ src/tools/tColor.h	2011-07-11 02:50:59 +0000
@@ -50,6 +50,9 @@
     void WriteSync( Tools::Color & target ) const; //!< writes sync data
     void ReadSync( Tools::Color const & source );  //!< reads sync data
 
+    static bool VerifyColorCode( const char * c );        // Verifys it's a valid color code
+    bool VerifyColorCode( const wchar_t * c);      // Verifys it's a valid color code
+
     // the colors are public because they are independent of each other
     REAL r_, g_, b_, a_;                    //!< Color values