Skip to content

[test-suite][lemon] Avoid UB in hash computations by using unsigned a… #280

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[test-suite][lemon] Avoid UB in hash computations by using unsigned a… #280

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 13 additions & 13 deletions MultiSource/Applications/lemon/lemon.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1238,14 +1238,14 @@ struct lemon *lemp;

/* Sort the configuration list */
void Configlist_sort(){
current = (struct config *)msort((char *)current,(char **)&(current->next),Configcmp);
current = (struct config *)msort((char *)current,(char **)&(current->next),(int(*)(const char*,const char*))Configcmp);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Complete the declaration instead of adding casts?

currentend = 0;
return;
}

/* Sort the basis configuration list */
void Configlist_sortbasis(){
basis = (struct config *)msort((char *)current,(char **)&(current->bp),Configcmp);
basis = (struct config *)msort((char *)current,(char **)&(current->bp),(int(*)(const char*,const char*))Configcmp);
basisend = 0;
return;
}
Expand Down Expand Up @@ -3356,7 +3356,7 @@ int mhflag; /* True if generating makeheaders output */
int maxdtlength; /* Maximum length of any ".datatype" field. */
char *stddt; /* Standardized name for a datatype */
int i,j; /* Loop counters */
int hash; /* For hashing the name of a type */
unsigned int hash; /* For hashing the name of a type (unsigned to avoid UB on overflow) */
char *name; /* Name of the parser */

/* Allocate and initialize types[] and allocate stddt[] */
Expand Down Expand Up @@ -4167,11 +4167,11 @@ char *s2;
** Code for processing tables in the LEMON parser generator.
*/

PRIVATE int strhash(x)
PRIVATE unsigned int strhash(x)
char *x;
{
int h = 0;
while( *x) h = h*13 + *(x++);
unsigned int h = 0;
while (*x) h = h*13u + (unsigned char)*(x++);
return h;
}

Expand Down Expand Up @@ -4552,12 +4552,12 @@ struct config *b;
PRIVATE int statehash(a)
struct config *a;
{
int h=0;
while( a ){
h = h*571 + a->rp->index*37 + a->dot;
unsigned int h = 0;
while (a) {
h = h*571u + (unsigned)a->rp->index * 37u + (unsigned)a->dot;
a = a->bp;
}
return h;
return (int)h;
}

/* Allocate a new state structure */
Expand Down Expand Up @@ -4711,9 +4711,9 @@ struct state **State_arrayof()
PRIVATE int confighash(a)
struct config *a;
{
int h=0;
h = h*571 + a->rp->index*37 + a->dot;
return h;
unsigned int h = 0;
h = h*571u + (unsigned)a->rp->index * 37u + (unsigned)a->dot;
return (int)h;
}

/* There is one instance of the following structure for each
Expand Down