Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-01-18 22:26:30 +01:00
Code Issues Projects Releases Packages Wiki Activity

fix crash: don't go beyond last edge

Browse source 
An obscure pattern from a user caught this one, but the test should have
been there all along.
This commit is contained in:
Eric House 2020-09-28 18:56:57 -07:00
parent e9ec30206d
commit eb728e4368
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
xwords4/common/dictiter.c
View file

@ -1130,13 +1130,15 @@ nextWord( DictIter* iter, XP_Bool log )
we're done, and the top-level while will exit) */
while ( 0 < iter->nEdges ) {
/* remove so isn't part of the match of its peers! */
array_edge* edge = popEdge( iter ) + dict->nodeSize;
PatMatch match = {0};
if ( nextPeerMatch( iter, &edge, &match, log ) ) {
pushEdge( iter, edge, &match ); /* let the top of the loop examine this one */
success = iter->min <= iter->nEdges && ACCEPT_NODE( iter, edge, log );
break;
array_edge* edge = popEdge( iter );
if ( !IS_LAST_EDGE( dict, edge ) ) {
edge += dict->nodeSize;
PatMatch match = {0};
if ( nextPeerMatch( iter, &edge, &match, log ) ) {
pushEdge( iter, edge, &match ); /* let the top of the loop examine this one */
success = iter->min <= iter->nEdges && ACCEPT_NODE( iter, edge, log );
break;
}
}
}
}