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

- undo hack from r25713

Browse Source 
* fix maybe_parse_hint_directives() when it is called multiple times for a
   procdef that has a deprecation message specified (fixes crashes
   reported in #25101/#25165)

git-svn-id: trunk@25719 -
This commit is contained in:
Jonas Maebe 2013-10-07 20:54:26 +00:00
parent 8fad859161
commit 9619ed8b4b
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/pdecsub.pas
View File

@ -2483,7 +2483,7 @@ const
_UNIMPLEMENTED, _UNIMPLEMENTED,
_EXPERIMENTAL, _EXPERIMENTAL,
_DEPRECATED : _DEPRECATED :
if ([m_delphi,m_objectivec1] * current_settings.modeswitches = [m_delphi]) and (pd.typ=procdef) then if (m_delphi in current_settings.modeswitches) and (pd.typ=procdef) then
maybe_parse_hint_directives(tprocdef(pd)) maybe_parse_hint_directives(tprocdef(pd))
else else
exit; exit;

3
compiler/ptype.pas
View File

@ -103,7 +103,8 @@ implementation
if assigned(pd) then if assigned(pd) then
begin begin
pd.symoptions:=pd.symoptions+dummysymoptions; pd.symoptions:=pd.symoptions+dummysymoptions;
pd.deprecatedmsg:=deprecatedmsg; if sp_has_deprecated_msg in dummysymoptions then
pd.deprecatedmsg:=deprecatedmsg;
end end
else else
stringdispose(deprecatedmsg); stringdispose(deprecatedmsg);