rooty/Arduino
1
0
Fork 0
mirror of https://github.com/arduino/Arduino.git synced 2024-12-01 12:24:14 +01:00
Code Issues Releases Activity

Adding some basic error checking to the String class (i.e. checking for a non-null buffer before modifying its contents).

Browse Source
This commit is contained in:
David A. Mellis 2010-08-18 21:39:28 +00:00
parent 5ede40be13
commit a48d96ee49
2 changed files with 35 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
hardware/arduino/cores/arduino/WString.cpp
View File

@ -27,29 +27,35 @@ String::String( const char *value )
if ( value == NULL )
value = "";
getBuffer( _length = strlen( value ) );
strcpy( _buffer, value );
if ( _buffer != NULL )
strcpy( _buffer, value );
}
String::String( const String &value )
{
getBuffer( _length = value._length );
strcpy( _buffer, value._buffer );
if ( _buffer != NULL )
strcpy( _buffer, value._buffer );
}
String::String( const char value )
{
_length = 1;
getBuffer(1);
_buffer[0] = value;
_buffer[1] = 0;
if ( _buffer != NULL ) {
_buffer[0] = value;
_buffer[1] = 0;
}
}
String::String( const unsigned char value )
{
_length = 1;
getBuffer(1);
_buffer[0] = value;
_buffer[1] = 0;
if ( _buffer != NULL) {
_buffer[0] = value;
_buffer[1] = 0;
}
}
String::String( const int value, const int base )
@ -57,7 +63,8 @@ String::String( const int value, const int base )
char buf[33];
itoa((signed long)value, buf, base);
getBuffer( _length = strlen(buf) );
strcpy( _buffer, buf );
if ( _buffer != NULL )
strcpy( _buffer, buf );
}
String::String( const unsigned int value, const int base )
@ -65,7 +72,8 @@ String::String( const unsigned int value, const int base )
char buf[33];
ultoa((unsigned long)value, buf, base);
getBuffer( _length = strlen(buf) );
strcpy( _buffer, buf );
if ( _buffer != NULL )
strcpy( _buffer, buf );
}
String::String( const long value, const int base )
@ -73,7 +81,8 @@ String::String( const long value, const int base )
char buf[33];
ltoa(value, buf, base);
getBuffer( _length = strlen(buf) );
strcpy( _buffer, buf );
if ( _buffer != NULL )
strcpy( _buffer, buf );
}
String::String( const unsigned long value, const int base )
@ -81,7 +90,8 @@ String::String( const unsigned long value, const int base )
char buf[33];
ultoa(value, buf, 10);
getBuffer( _length = strlen(buf) );
strcpy( _buffer, buf );
if ( _buffer != NULL )
strcpy( _buffer, buf );
}
char String::charAt( unsigned int loc ) const
@ -91,6 +101,7 @@ char String::charAt( unsigned int loc ) const
void String::setCharAt( unsigned int loc, const char aChar )
{
if(_buffer == NULL) return;
if(_length > loc) {
_buffer[loc] = aChar;
}
@ -116,8 +127,11 @@ const String & String::operator=( const String &rhs )
free(_buffer);
getBuffer( rhs._length );
}
_length = rhs._length;
strcpy( _buffer, rhs._buffer );
if ( _buffer != NULL ) {
_length = rhs._length;
strcpy( _buffer, rhs._buffer );
}
return *this;
}
@ -138,10 +152,12 @@ const String & String::operator+=( const String &other )
{
char *temp = _buffer;
getBuffer( _length );
strcpy( _buffer, temp );
if ( _buffer != NULL )
strcpy( _buffer, temp );
free(temp);
}
strcat( _buffer, other._buffer );
if ( _buffer != NULL )
strcat( _buffer, other._buffer );
return *this;
}
@ -213,6 +229,7 @@ boolean String::equalsIgnoreCase( const String &s2 ) const
String String::replace( char findChar, char replaceChar )
{
if ( _buffer == NULL ) return *this;
String theReturn = _buffer;
char* temp = theReturn._buffer;
while( (temp = strchr( temp, findChar )) != 0 )
@ -223,6 +240,7 @@ String String::replace( char findChar, char replaceChar )
String String::replace( const String& match, const String& replace )
{
if ( _buffer == NULL ) return *this;
String temp = _buffer, newString;
int loc;
@ -376,6 +394,7 @@ String String::toUpperCase() const
String String::trim() const
{
if ( _buffer == NULL ) return *this;
String temp = _buffer;
unsigned int i,j;

13
hardware/arduino/cores/arduino/WString.h
View File

@ -52,7 +52,7 @@ class String
char operator []( unsigned int index ) const;
char& operator []( unsigned int index );
//operator const char *() const { return _buffer; }
// general methods
char charAt( unsigned int index ) const;
int compareTo( const String &anotherString ) const;
@ -89,7 +89,6 @@ class String
unsigned int _length; // the String length (not counting the '\0')
void getBuffer(unsigned int maxStrLen);
void doubleBuffer( );
private:
@ -100,15 +99,7 @@ inline void String::getBuffer(unsigned int maxStrLen)
{
_capacity = maxStrLen;
_buffer = (char *) malloc(_capacity + 1);
}
// double the buffer size
inline void String::doubleBuffer( )
{
char *temp = _buffer;
getBuffer( ++_capacity * 2 );
strcpy( _buffer, temp );
free(temp);
if (_buffer == NULL) _length = _capacity = 0;
}
inline String operator+( String lhs, const String &rhs )