2 files changed, 23 insertions, 2 deletions

diff --git a/src/stable/string.cpp b/src/stable/string.cpp
index d1f76aa..dd484fd 100644
--- a/src/stable/string.cpp
+++ b/src/stable/string.cpp
@@ -1269,10 +1269,30 @@ Bu::String Bu::String::FormatProxy::end() const
                         else
                         {
                                 String sNum;
-                                while( s && *s >= '0' && *s <= '9' )
+                                if( *s == '{' )
                                 {
-                                        sNum += *s;
                                         s++;
+                                        while( s && *s >= '0' && *s <= '9' )
+                                        {
+                                                sNum += *s;
+                                                s++;
+                                        }
+                                        if( !s || *s != '}' )
+                                        {
+                                                delete[] aArg;
+                                                throw Bu::ExceptionBase(
+                                                        "Argument started with a '{' but terminated "
+                                                        "with a '%c' instead of '}'.", *s );
+                                        }
+                                        s++;
+                                }
+                                else
+                                {
+                                        while( s && *s >= '0' && *s <= '9' )
+                                        {
+                                                sNum += *s;
+                                                s++;
+                                        }
                                 }
                                 int iIndex = strtol( sNum.getStr(), 0, 10 )-1;
                                 if( iIndex < 0 || iIndex >= iCount )
diff --git a/src/stable/string.h b/src/stable/string.h
index c92a704..197821d 100644
--- a/src/stable/string.h
+++ b/src/stable/string.h
@@ -950,6 +950,7 @@ namespace Bu
                 class FormatProxyEndAction
                 {
                 public:
+                        virtual ~FormatProxyEndAction() { };
                         virtual void operator()( const Bu::String &sFinal )=0;
                 };