mirror of
https://github.com/cc65/cc65.git
synced 2024-08-31 07:29:23 +00:00
The type parser didn't check bounds for the type string it created in a
fixed size buffer. git-svn-id: svn://svn.cc65.org/cc65/trunk@3005 b7a2c559-68d2-44c3-8de9-860c34a00d81
This commit is contained in:
parent
4add4c3396
commit
fe9c53730c
@ -155,7 +155,41 @@ static void InitDeclaration (Declaration* D)
|
|||||||
{
|
{
|
||||||
D->Ident[0] = '\0';
|
D->Ident[0] = '\0';
|
||||||
D->Type[0] = T_END;
|
D->Type[0] = T_END;
|
||||||
D->T = D->Type;
|
D->Index = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
static void NeedTypeSpace (Declaration* D, unsigned Count)
|
||||||
|
/* Check if there is enough space for Count type specifiers within D */
|
||||||
|
{
|
||||||
|
if (D->Index + Count >= MAXTYPELEN) {
|
||||||
|
/* We must call Fatal() here, since calling Error() will try to
|
||||||
|
* continue, and the declaration type is not correctly terminated
|
||||||
|
* in case we come here.
|
||||||
|
*/
|
||||||
|
Fatal ("Too many type specifiers");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
static void AddTypeToDeclaration (Declaration* D, type T)
|
||||||
|
/* Add a type specifier to the type of a declaration */
|
||||||
|
{
|
||||||
|
NeedTypeSpace (D, 1);
|
||||||
|
D->Type[D->Index++] = T;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
static void AddEncodeToDeclaration (Declaration* D, type T, unsigned long Val)
|
||||||
|
/* Add a type plus encoding to the type of a declaration */
|
||||||
|
{
|
||||||
|
NeedTypeSpace (D, DECODE_SIZE+1);
|
||||||
|
D->Type[D->Index++] = T;
|
||||||
|
Encode (D->Type + D->Index, Val);
|
||||||
|
D->Index += DECODE_SIZE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -938,7 +972,8 @@ static void Decl (const DeclSpec* Spec, Declaration* D, unsigned Mode)
|
|||||||
/* Parse the type, the pointer points to */
|
/* Parse the type, the pointer points to */
|
||||||
Decl (Spec, D, Mode);
|
Decl (Spec, D, Mode);
|
||||||
|
|
||||||
*D->T++ = T;
|
/* Add the type */
|
||||||
|
AddTypeToDeclaration (D, T);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -946,7 +981,7 @@ static void Decl (const DeclSpec* Spec, Declaration* D, unsigned Mode)
|
|||||||
if (CurTok.Tok == TOK_FASTCALL || CurTok.Tok == TOK_NEAR || CurTok.Tok == TOK_FAR) {
|
if (CurTok.Tok == TOK_FASTCALL || CurTok.Tok == TOK_NEAR || CurTok.Tok == TOK_FAR) {
|
||||||
|
|
||||||
/* Remember the current type pointer */
|
/* Remember the current type pointer */
|
||||||
type* T = D->T;
|
type* T = D->Type + D->Index;
|
||||||
|
|
||||||
/* Read the flags */
|
/* Read the flags */
|
||||||
unsigned Flags = FunctionModifierFlags ();
|
unsigned Flags = FunctionModifierFlags ();
|
||||||
@ -995,14 +1030,16 @@ static void Decl (const DeclSpec* Spec, Declaration* D, unsigned Mode)
|
|||||||
|
|
||||||
while (CurTok.Tok == TOK_LBRACK || CurTok.Tok == TOK_LPAREN) {
|
while (CurTok.Tok == TOK_LBRACK || CurTok.Tok == TOK_LPAREN) {
|
||||||
if (CurTok.Tok == TOK_LPAREN) {
|
if (CurTok.Tok == TOK_LPAREN) {
|
||||||
|
|
||||||
/* Function declaration */
|
/* Function declaration */
|
||||||
FuncDesc* F;
|
FuncDesc* F;
|
||||||
NextToken ();
|
NextToken ();
|
||||||
|
|
||||||
/* Parse the function declaration */
|
/* Parse the function declaration */
|
||||||
F = ParseFuncDecl (Spec);
|
F = ParseFuncDecl (Spec);
|
||||||
*D->T++ = T_FUNC;
|
|
||||||
EncodePtr (D->T, F);
|
/* Add the function type. Be sure to bounds check the type buffer */
|
||||||
D->T += DECODE_SIZE;
|
AddEncodeToDeclaration (D, T_FUNC, (unsigned long) F);
|
||||||
} else {
|
} else {
|
||||||
/* Array declaration */
|
/* Array declaration */
|
||||||
long Size = UNSPECIFIED;
|
long Size = UNSPECIFIED;
|
||||||
@ -1022,9 +1059,9 @@ static void Decl (const DeclSpec* Spec, Declaration* D, unsigned Mode)
|
|||||||
Size = lval.ConstVal;
|
Size = lval.ConstVal;
|
||||||
}
|
}
|
||||||
ConsumeRBrack ();
|
ConsumeRBrack ();
|
||||||
*D->T++ = T_ARRAY;
|
|
||||||
Encode (D->T, Size);
|
/* Add the type */
|
||||||
D->T += DECODE_SIZE;
|
AddEncodeToDeclaration (D, T_ARRAY, Size);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -1069,7 +1106,8 @@ void ParseDecl (const DeclSpec* Spec, Declaration* D, unsigned Mode)
|
|||||||
Decl (Spec, D, Mode);
|
Decl (Spec, D, Mode);
|
||||||
|
|
||||||
/* Add the base type. */
|
/* Add the base type. */
|
||||||
TypeCpy (D->T, Spec->Type);
|
NeedTypeSpace (D, TypeLen (Spec->Type) + 1); /* Bounds check */
|
||||||
|
TypeCpy (D->Type + D->Index, Spec->Type);
|
||||||
|
|
||||||
/* Check the size of the generated type */
|
/* Check the size of the generated type */
|
||||||
if (!IsTypeFunc (D->Type) && !IsTypeVoid (D->Type) && SizeOf (D->Type) >= 0x10000) {
|
if (!IsTypeFunc (D->Type) && !IsTypeVoid (D->Type) && SizeOf (D->Type) >= 0x10000) {
|
||||||
|
@ -70,7 +70,7 @@ struct Declaration {
|
|||||||
type Type [MAXTYPELEN]; /* The type */
|
type Type [MAXTYPELEN]; /* The type */
|
||||||
|
|
||||||
/* Working variables */
|
/* Working variables */
|
||||||
type* T; /* Used to build Type */
|
unsigned Index; /* Used to build Type */
|
||||||
};
|
};
|
||||||
|
|
||||||
/* Modes for ParseDecl */
|
/* Modes for ParseDecl */
|
||||||
|
Loading…
Reference in New Issue
Block a user