1 files changed, 11 insertions, 2 deletions
diff --git a/libstdc++-v3/testsuite/22_locale/codecvt_members_char_char.cc b/libstdc++-v3/testsuite/22_locale/codecvt_members_char_char.cc
index 9cf4e7d5c70..b2acb675351 100644
--- a/libstdc++-v3/testsuite/22_locale/codecvt_members_char_char.cc
+++ b/libstdc++-v3/testsuite/22_locale/codecvt_members_char_char.cc
@@ -36,25 +36,33 @@ void test01()
   const char* 	        from_next;
   int 			size = 25;
   char* 		c_arr = new char[size];
+  char*                 c_ref = new char[size];
   char*			to_next;
 
   locale 		loc;
   c_codecvt::state_type state;
   const c_codecvt* 	cvt = &use_facet<c_codecvt>(loc); 
 
+  // According to the resolution of DR19 (see also libstd++/9168), in
+  // case of degenerate conversion ('noconv'), "there are no changes to
+  // the values in [to, to_limit)."
+  memset(c_ref, 'X', size);
+
   // in
+  memset(c_arr, 'X', size);
   result r1 = cvt->in(state, c_lit, c_lit + size, from_next, 
 		      c_arr, c_arr + size, to_next);
   VERIFY( r1 == codecvt_base::noconv );
-  VERIFY( !strcmp(c_arr, c_lit) ); 
+  VERIFY( !memcmp(c_arr, c_ref, size) ); 
   VERIFY( from_next == c_lit );
   VERIFY( to_next == c_arr );
 
   // out
+  memset(c_arr, 'X', size);
   result r2 = cvt->out(state, c_lit, c_lit + size, from_next, 
 		       c_arr, c_arr + size, to_next);
   VERIFY( r2 == codecvt_base::noconv );
-  VERIFY( !strcmp(c_arr, c_lit) ); 
+  VERIFY( !memcmp(c_arr, c_ref, size) ); 
   VERIFY( from_next == c_lit );
   VERIFY( to_next == c_arr );
 
@@ -77,6 +85,7 @@ void test01()
   VERIFY( k == 1 );
 
   delete [] c_arr;
+  delete [] c_ref;
 }
 
 // libstdc++/5280