Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2024-12-28 09:58:30 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix to read any length string from stream

Browse source
This commit is contained in:
Eric House 2023-04-21 17:50:01 -07:00
parent dc0c63dc24
commit 3c56490c01
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
xwords4/common/strutils.c
View file

@ -233,20 +233,19 @@ p_stringFromStream( MPFORMAL XWStreamCtxt* stream
#endif
)
{
/* PENDING: Hard-coded max buffer size is wrong!!! stringFromStreamHere()
needs to "peek" and return the size required. Or better, call XP_MALLOC
itself (with mpool passed in?) */
XP_UCHAR buf[1024];
XP_UCHAR* str = (XP_UCHAR*)NULL;
XP_U16 len = stringFromStreamHere( stream, buf, sizeof(buf) );
XP_U16 version = stream_getVersion( stream );
XP_U32 len = version < STREAM_VERS_NORELAY ? stream_getU8( stream )
: stream_getU32VL( stream );
if ( len > 0 ) {
XP_UCHAR* str = NULL;
if ( 0 < len ) {
#ifdef MEM_DEBUG
str = mpool_alloc( mpool, len + 1, file, func, lineNo );
#else
str = (XP_UCHAR*)XP_MALLOC( mpool, len + 1 ); /* leaked */
str = (XP_UCHAR*)XP_MALLOC( mpool, len + 1 );
#endif
XP_MEMCPY( str, buf, len + 1 );
stream_getBytes( stream, str, len );
str[len] = '\0';
}
return str;
} /* makeStringFromStream */