Commit 4bf77766 authored by Dimitri van Heesch's avatar Dimitri van Heesch

Bug 719463 - Invalid null key and segmentation fault

parent 58b2c852
...@@ -5911,29 +5911,29 @@ int extractClassNameFromType(const QCString &type,int &pos,QCString &name,QCStri ...@@ -5911,29 +5911,29 @@ int extractClassNameFromType(const QCString &type,int &pos,QCString &name,QCStri
static const QRegExp re_ftn("[a-z_A-Z\\x80-\\xFF][()=_a-z_A-Z0-9:\\x80-\\xFF]*"); static const QRegExp re_ftn("[a-z_A-Z\\x80-\\xFF][()=_a-z_A-Z0-9:\\x80-\\xFF]*");
QRegExp re; QRegExp re;
if (lang == SrcLangExt_Fortran) name.resize(0);
templSpec.resize(0);
int i,l;
int typeLen=type.length();
if (typeLen>0)
{ {
if (type.at(pos)==',') return -1; if (lang == SrcLangExt_Fortran)
if (type.left(4).lower()=="type")
{ {
re = re_norm; if (type.at(pos)==',') return -1;
if (type.left(4).lower()=="type")
{
re = re_norm;
}
else
{
re = re_ftn;
}
} }
else else
{ {
re = re_ftn; re = re_norm;
} }
}
else
{
re = re_norm;
}
name.resize(0);
templSpec.resize(0);
int i,l;
int typeLen=type.length();
if (typeLen>0)
{
if ((i=re.match(type,pos,&l))!=-1) // for each class name in the type if ((i=re.match(type,pos,&l))!=-1) // for each class name in the type
{ {
int ts=i+l; int ts=i+l;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment