paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-08-16 12:39:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

* give an error if an explicit enumeration valid exceeds the valid range, resolves #34633

Browse Source 
git-svn-id: trunk@43191 -
This commit is contained in:
florian 2019-10-13 15:48:21 +00:00
parent 2d06d7ed46
commit 626ef4ae0c
6 changed files with 606 additions and 585 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitattributes vendored
View File

@ -16049,6 +16049,7 @@ tests/webtbf/tw3395.pp svneol=native#text/plain
tests/webtbf/tw3395a.pp svneol=native#text/plain tests/webtbf/tw3395a.pp svneol=native#text/plain
tests/webtbf/tw34355.pp svneol=native#text/pascal tests/webtbf/tw34355.pp svneol=native#text/pascal
tests/webtbf/tw3450.pp svneol=native#text/plain tests/webtbf/tw3450.pp svneol=native#text/plain
tests/webtbf/tw34633.pp svneol=native#text/pascal
tests/webtbf/tw34691.pp svneol=native#text/pascal tests/webtbf/tw34691.pp svneol=native#text/pascal
tests/webtbf/tw3473.pp svneol=native#text/plain tests/webtbf/tw3473.pp svneol=native#text/plain
tests/webtbf/tw3480.pp svneol=native#text/plain tests/webtbf/tw3480.pp svneol=native#text/plain

3
compiler/msg/errore.msg
View File

@ -1600,6 +1600,9 @@ parser_e_callthrough_varargs=03350_E_Cannot redeclare C-style variadic function
% platforms. Even on platforms where it is supported, this is quite inefficient. % platforms. Even on platforms where it is supported, this is quite inefficient.
parser_e_unbound_attribute=03351_E_Unbound custom attribute: "$1". parser_e_unbound_attribute=03351_E_Unbound custom attribute: "$1".
% A custom attribute is defined, but there is no identifier to bind it to. % A custom attribute is defined, but there is no identifier to bind it to.
parser_e_enumeration_out_of_range=03352_E_Enumeration symbols can only have values in the range of -2^31 to 2^31-1
% The size of enumeration values is limited to 4 bytes. As the value can be signed, the range
% of valid values is limited to a signed 32 Bit value (i.e. \var{longint}).
% %
% \end{description} % \end{description}
% %

5
compiler/msgidx.inc
View File

@ -462,6 +462,7 @@ const
parser_e_only_static_members_via_object_type=03349; parser_e_only_static_members_via_object_type=03349;
parser_e_callthrough_varargs=03350; parser_e_callthrough_varargs=03350;
parser_e_unbound_attribute=03351; parser_e_unbound_attribute=03351;
parser_e_enumeration_out_of_range=03352;
type_e_mismatch=04000; type_e_mismatch=04000;
type_e_incompatible_types=04001; type_e_incompatible_types=04001;
type_e_not_equal_types=04002; type_e_not_equal_types=04002;
@ -1113,9 +1114,9 @@ const
option_info=11024; option_info=11024;
option_help_pages=11025; option_help_pages=11025;
MsgTxtSize = 83621; MsgTxtSize = 83702;
MsgIdxMax : array[1..20] of longint=( MsgIdxMax : array[1..20] of longint=(
28,106,352,126,99,61,143,34,221,68, 28,106,353,126,99,61,143,34,221,68,
62,20,30,1,1,1,1,1,1,1 62,20,30,1,1,1,1,1,1,1
); );

1173
compiler/msgtxt.inc
View File

File diff suppressed because it is too large Load Diff

2
compiler/ptype.pas
View File

@ -1718,6 +1718,8 @@ implementation
begin begin
storepos:=current_tokenpos; storepos:=current_tokenpos;
current_tokenpos:=defpos; current_tokenpos:=defpos;
if (l.svalue<low(longint)) or (l.svalue>high(longint)) then
Message(parser_e_enumeration_out_of_range);
tenumsymtable(aktenumdef.symtable).insert(cenumsym.create(s,aktenumdef,longint(l.svalue))); tenumsymtable(aktenumdef.symtable).insert(cenumsym.create(s,aktenumdef,longint(l.svalue)));
if not (cs_scopedenums in current_settings.localswitches) then if not (cs_scopedenums in current_settings.localswitches) then
tstoredsymtable(aktenumdef.owner).insert(cenumsym.create(s,aktenumdef,longint(l.svalue))); tstoredsymtable(aktenumdef.owner).insert(cenumsym.create(s,aktenumdef,longint(l.svalue)));

7
tests/webtbf/tw34633.pp Normal file
View File

@ -0,0 +1,7 @@
{ %fail }
{$mode delphi}
type tenum = (b0, b1, b2, bMax = high(dword));
begin
writeln(sizeof(tenum));
end.