From 99425265031f423d75230090bc71a86a5f14aa50 Mon Sep 17 00:00:00 2001 From: Alexander Monakov Date: Tue, 27 Apr 2010 16:00:35 +0400 Subject: [PATCH] 1.c (test01): Clarify size definition. 2010-04-27 Alexander Monakov * testsuite/22_locale/codecvt/unshift/char/1.c (test01): Clarify size definition. Use memcpy and memcmp to avoid access beyond allocated memory. From-SVN: r158780 --- libstdc++-v3/ChangeLog | 6 ++++++ libstdc++-v3/testsuite/22_locale/codecvt/unshift/char/1.cc | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 4d96e3a1cc4..501037e790a 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,9 @@ +2010-04-27 Alexander Monakov + + * testsuite/22_locale/codecvt/unshift/char/1.c (test01): Clarify size + definition. Use memcpy and memcmp to avoid access beyond allocated + memory. + 2010-04-27 Jonathan Wakely * doc/xml/manual/status_cxx200x.xml: Update to match n3092. diff --git a/libstdc++-v3/testsuite/22_locale/codecvt/unshift/char/1.cc b/libstdc++-v3/testsuite/22_locale/codecvt/unshift/char/1.cc index ba417af0e6d..363b72e27ff 100644 --- a/libstdc++-v3/testsuite/22_locale/codecvt/unshift/char/1.cc +++ b/libstdc++-v3/testsuite/22_locale/codecvt/unshift/char/1.cc @@ -35,7 +35,7 @@ void test01() bool test __attribute__((unused)) = true; const char* c_lit = "black pearl jasmine tea"; const char* from_next; - int size = 23; + int size = std::strlen(c_lit); char* c_arr = new char[size]; char* c_ref = new char[size]; char* to_next; @@ -68,10 +68,10 @@ void test01() VERIFY( to_next == c_arr ); // unshift - strcpy(c_arr, c_lit); + memcpy(c_arr, c_lit, size); result r3 = cvt->unshift(state, c_arr, c_arr + size, to_next); VERIFY( r3 == codecvt_base::noconv ); - VERIFY( !strcmp(c_arr, c_lit) ); + VERIFY( !memcmp(c_arr, c_lit, size) ); VERIFY( to_next == c_arr ); delete [] c_arr;