Fix buffer overflow in wxURLDataObject.

[wxWidgets.git] / tests / strings / vararg.cpp

diff --git a/tests/strings/vararg.cpp b/tests/strings/vararg.cpp
index b0e0eaa5da1fe368a0d53aabfc983c39d3b033a6..f1a3e54ff63667c4f96e34cda4c0bbddfd234e9c 100644 (file)
--- a/tests/strings/vararg.cpp
+++ b/tests/strings/vararg.cpp
@@ -41,6 +41,7 @@ private:
         CPPUNIT_TEST( StdString );
 #endif
         CPPUNIT_TEST( Sscanf );
+        CPPUNIT_TEST( RepeatedPrintf );
     CPPUNIT_TEST_SUITE_END();
 
     void StringPrintf();
@@ -49,6 +50,7 @@ private:
     void StdString();
 #endif
     void Sscanf();
+    void RepeatedPrintf();
 
     DECLARE_NO_COPY_CLASS(VarArgTestCase)
 };
@@ -66,33 +68,33 @@ void VarArgTestCase::StringPrintf()
     // test passing literals:
     s.Printf("%s %i", "foo", 42);
     CPPUNIT_ASSERT( s == "foo 42" );
-    s.Printf("%s %s %i", _T("bar"), "=", 11);
+    s.Printf("%s %s %i", wxT("bar"), "=", 11);
 
     // test passing c_str():
     CPPUNIT_ASSERT( s == "bar = 11" );
     s2.Printf("(%s)", s.c_str());
     CPPUNIT_ASSERT( s2 == "(bar = 11)" );
-    s2.Printf(_T("[%s](%s)"), s.c_str(), "str");
+    s2.Printf(wxT("[%s](%s)"), s.c_str(), "str");
     CPPUNIT_ASSERT( s2 == "[bar = 11](str)" );
 
     s2.Printf("%s mailbox", wxString("Opening").c_str());
     CPPUNIT_ASSERT( s2 == "Opening mailbox" );
 
     // test passing wxString directly:
-    s2.Printf(_T("[%s](%s)"), s, "str");
+    s2.Printf(wxT("[%s](%s)"), s, "str");
     CPPUNIT_ASSERT( s2 == "[bar = 11](str)" );
 
     // test passing wxCharBufferType<T>:
     s = "FooBar";
-    s2.Printf(_T("(%s)"), s.mb_str());
+    s2.Printf(wxT("(%s)"), s.mb_str());
     CPPUNIT_ASSERT( s2 == "(FooBar)" );
-    s2.Printf(_T("value=%s;"), s.wc_str());
+    s2.Printf(wxT("value=%s;"), s.wc_str());
     CPPUNIT_ASSERT( s2 == "value=FooBar;" );
 
     // this tests correct passing of wxCStrData constructed from string
     // literal:
     bool cond = true;
-    s2.Printf(_T("foo %s"), !cond ? s.c_str() : _T("bar"));
+    s2.Printf(wxT("foo %s"), !cond ? s.c_str() : wxT("bar"));
 }
 
 void VarArgTestCase::CharPrintf()
@@ -165,3 +167,19 @@ void VarArgTestCase::Sscanf()
     CPPUNIT_ASSERT( i == 42 );
     CPPUNIT_ASSERT( wxStrcmp(wstr, "test") == 0 );
 }
+
+void VarArgTestCase::RepeatedPrintf()
+{
+    wxCharBuffer buffer(2);
+    char *p = buffer.data();
+    *p = 'h';
+    p++;
+    *p = 'i';
+
+    wxString s;
+    s = wxString::Format("buffer %s, len %d", buffer, wxStrlen(buffer));
+    CPPUNIT_ASSERT_EQUAL("buffer hi, len 2", s);
+
+    s = wxString::Format("buffer %s, len %d", buffer, wxStrlen(buffer));
+    CPPUNIT_ASSERT_EQUAL("buffer hi, len 2", s);
+}