copy null byte along with rest of string

This commit is contained in:
ehouse 2005-06-28 04:42:08 +00:00
parent 4701ee8c34
commit acd3bdf24b

View file

@ -93,10 +93,10 @@ loadFromGameInfo( HWND hDlg, CEAppGlobals* globals, GameInfoState* giState )
if ( !!gi->dictName ) { if ( !!gi->dictName ) {
str = bname( gi->dictName ); str = bname( gi->dictName );
XP_MEMCPY( giState->newDictName, gi->dictName, XP_MEMCPY( giState->newDictName, gi->dictName,
(XP_U16)XP_STRLEN(gi->dictName) ); (XP_U16)XP_STRLEN(gi->dictName)+1 );
} else if ( !!(str = ceLocateNthDict( MPPARM(globals->mpool) 0 ) ) ) { } else if ( !!(str = ceLocateNthDict( MPPARM(globals->mpool) 0 ) ) ) {
XP_MEMCPY( giState->newDictName, str, (XP_U16)XP_STRLEN(str) ); XP_MEMCPY( giState->newDictName, str, (XP_U16)XP_STRLEN(str)+1 );
XP_FREE( globals->mpool, str ); XP_FREE( globals->mpool, str );
str = bname( giState->newDictName ); str = bname( giState->newDictName );
@ -481,7 +481,7 @@ GameInfo(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
if ( giState->isNewGame ) { /* ignore if in info mode */ if ( giState->isNewGame ) { /* ignore if in info mode */
giState->newDictName[0] = 0; giState->newDictName[0] = 0;
if ( ce_pickDictFile( globals, giState->newDictName, if ( ce_pickDictFile( globals, giState->newDictName,
sizeof(giState->newDictName) ) ) { sizeof(giState->newDictName) )) {
XP_UCHAR* basename = bname(giState->newDictName); XP_UCHAR* basename = bname(giState->newDictName);
ceSetDlgItemFileName( hDlg, id, basename ); ceSetDlgItemFileName( hDlg, id, basename );
} }