1 files changed, 4 insertions, 0 deletions

diff --git a/src/fbasicstring.h b/src/fbasicstring.h
index 57e798e..6a1708d 100644
--- a/src/fbasicstring.h
+++ b/src/fbasicstring.h
@@ -1336,6 +1336,8 @@ namespace Bu
                  */
                 chr &operator[]( long nIndex )
                 {
+                        if( nIndex < 0 || nIndex >= nLength )
+                                throw Bu::ExceptionBase("Index out of range.");
                         flatten();
 
                         return pFirst->pData[nIndex];
@@ -1348,6 +1350,8 @@ namespace Bu
                  */
                 const chr &operator[]( long nIndex ) const
                 {
+                        if( nIndex < 0 || nIndex >= nLength )
+                                throw Bu::ExceptionBase("Index out of range.");
                         flatten();
 
                         return pFirst->pData[nIndex];