Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-15 15:41:24 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix NPE when len not initialized

Browse source 
Duh....
This commit is contained in:
Eric House 2021-02-28 12:02:20 -08:00
parent d5e7dc4c97
commit 664913b2eb
2 changed files with 25 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
xwords4/wasm/main.c
View file

@ -107,6 +107,7 @@ static void ensureName( GameState* gs );
static void loadName( GameState* gs );
static void saveName( GameState* gs );
static bool isVisible( GameState* gs );
static int countDicts( Globals* globals );
typedef void (*BinProc)(void* closure, const uint8_t* data, int len );
@ -470,13 +471,25 @@ updateGameButtons( Globals* globals )
setButtons( BUTTONS_ID_GAME, buttons, onGameButton, gs );
}
static void
showName( GameState* gs )
{
const char* title = gs->gameName;
char buf[64];
if ( 1 < countDicts( gs->globals ) ) {
sprintf( buf, "%s (%s)", gs->gameName, lcToLocale(gs->gi.dictLang) );
title = buf;
}
show_name( title );
}
static void
onGameRanamed( void* closure, const char* newName )
{
if ( !!newName ) {
CAST_GS(GameState*, gs, closure);
nameGame( gs, newName );
show_name( newName );
showName( gs );
}
}
@ -514,7 +527,7 @@ onOneIndx( void* closure, const XP_UCHAR* indx )
XP_LOGFF( "(indx: %s)", indx );
NameIterState* nis = (NameIterState*)closure;
Globals* globals = nis->globals;
++nis->count;
int cur = nis->count++;
nis->names = XP_REALLOC( globals->mpool, nis->names,
nis->count * sizeof(nis->names[0]) );
@ -522,15 +535,13 @@ onOneIndx( void* closure, const XP_UCHAR* indx )
dutil_loadIndxPtr( globals->dutil, NULL, KEY_NAME, indx, NULL, &valLen );
uint8_t val[valLen];
dutil_loadIndxPtr( globals->dutil, NULL, KEY_NAME, indx, val, &valLen );
nis->names[nis->count-1] = XP_MALLOC( globals->mpool, valLen );
XP_MEMCPY( nis->names[nis->count-1], val, valLen );
nis->names[cur] = XP_MALLOC( globals->mpool, valLen );
XP_MEMCPY( nis->names[cur], val, valLen );
nis->ids = XP_REALLOC( globals->mpool, nis->ids,
nis->count * sizeof(nis->ids[0]) );
nis->ids[nis->count-1] = XP_MALLOC( globals->mpool, 1 + strlen(indx) );
strcpy( nis->ids[nis->count-1], indx );
XP_LOGFF( "recorded %s => %s", nis->ids[nis->count-1], nis->names[nis->count-1] );
nis->ids[cur] = XP_MALLOC( globals->mpool, 1 + strlen(indx) );
strcpy( nis->ids[cur], indx );
return true; /* keep going */
}
@ -782,7 +793,7 @@ startGame( GameState* gs, const char* name )
gs->globals->curGame = gs;
ensureName( gs );
XP_LOGFF( "changed curGame to %s", gs->gameName );
show_name( gs->gameName );
showName( gs );
storeCurOpen( gs );
BoardDims dims;
@ -998,7 +1009,7 @@ onOneDict( void* closure, const XP_UCHAR* indx )
FindOneState* fos = (FindOneState*)closure;
XW_DUtilCtxt* dutil = fos->globals->dutil;
XP_U32 len = 0;
XP_U32 len;
dutil_loadIndxPtr( dutil, NULL, KEY_DICTS, indx, NULL, &len );
uint8_t* ptr = XP_MALLOC( fos->globals->mpool, len );
dutil_loadIndxPtr( dutil, NULL, KEY_DICTS, indx, ptr, &len );

8
xwords4/wasm/wasmdutil.c
View file

@ -257,14 +257,14 @@ wasm_dutil_loadPtr( XW_DUtilCtxt* duc, XWEnv xwe, const XP_UCHAR* key,
// XP_LOGFF( "get_stored_value(%s) => %s", fullKey, val );
len = XP_STRLEN(val);
XP_ASSERT( (len % 2) == 0 );
XP_U8* decodeBuf = XP_MALLOC( duc->mpool, len/2 );
len = len/2;
if ( len <= *lenp ) {
len /= 2;
if ( !!data && len <= *lenp ) {
uint8_t* decodeBuf = XP_MALLOC( duc->mpool, len );
base16Decode( decodeBuf, len, val );
XP_MEMCPY( data, decodeBuf, len );
XP_FREE( duc->mpool, decodeBuf );
}
*lenp = len;
XP_FREE( duc->mpool, decodeBuf );
} else {
*lenp = 0; /* signal failure */
}