actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix txtin/txtout memleaks

Browse Source 
iconv and CString are both 8-bit clean; maintain that
error checks
This commit is contained in:
Glenn Maynard
2004-11-04 23:24:16 +00:00
parent 24614c9bc4
commit 5390cea922
1 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/RageUtil_CharConversions.cpp
+17 -12
View File
@@ -52,21 +52,17 @@ static bool ConvertFromCharset( CString &txt, const char *charset )
} }
/* Copy the string into a char* for iconv */ /* Copy the string into a char* for iconv */
char *txtin = new char[ txt.size() + 1 ]; char *txtin = const_cast<char*>( txt.data() );
strcpy( txtin, txt ); size_t inleft = txt.size();
size_t inleft = strlen( txtin );
/* Create a new string with enough room for the new conversion */ /* Create a new string with enough room for the new conversion */
char *txtout = new char[ (txt.size() + 1) * 5 ]; CString buf;
txtout = (char *)memset( txtout, 0, (txt.size() + 1) * 5 ); buf.resize( txt.size() * 5 );
size_t outleft = inleft * 5;
size_t outsize = outleft;
char *txtout = const_cast<char*>( buf.data() );
size_t outleft = buf.size();
size_t size = iconv( converter, &txtin, &inleft, &txtout, &outleft ); size_t size = iconv( converter, &txtin, &inleft, &txtout, &outleft );
/* Redirect the output pointer back to the beginning of the string */
outsize -= outleft;
txtout -= outsize;
iconv_close( converter ); iconv_close( converter );
if( size == (size_t)(-1) ) if( size == (size_t)(-1) )
@@ -74,10 +70,19 @@ static bool ConvertFromCharset( CString &txt, const char *charset )
LOG->Trace( "%s\n", strerror( errno ) ); LOG->Trace( "%s\n", strerror( errno ) );
return false; /* Returned an error */ return false; /* Returned an error */
} }
if( !strlen(txtout) )
if( inleft != 0 )
{
LOG->Warn( "iconv(UTF-8,%s) for \"%s\": whole buffer not converted (%i left)", charset, txt.c_str(), inleft );
return false;
}
if( buf.size() == outleft )
return false; /* Conversion failed */ return false; /* Conversion failed */
txt = txtout; buf.resize( buf.size()-outleft );
txt = buf;
return true; return true;
} }