From 31bbc5c0538e1119273c4dc43bad8e2803711165 Mon Sep 17 00:00:00 2001 From: inoussa Date: Mon, 16 Jun 2014 15:11:10 +0000 Subject: [PATCH] XSD generator: prevent a Nil object reference (=>AV) (Thanks Juha Maninnen) git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@3176 8e941d3f-bd1b-0410-a28a-d453659cc2b4 --- wst/trunk/ws_helper/xsd_generator.pas | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/wst/trunk/ws_helper/xsd_generator.pas b/wst/trunk/ws_helper/xsd_generator.pas index 7b1ccc135..427abbbc9 100644 --- a/wst/trunk/ws_helper/xsd_generator.pas +++ b/wst/trunk/ws_helper/xsd_generator.pas @@ -971,9 +971,9 @@ var end; propNode.SetAttribute(s_name,AContainer.GetExternalName(p)); propTypItm := p.VarType; + if Assigned(propTypItm) and propTypItm.InheritsFrom(TPasUnresolvedTypeRef) then + propTypItm := AContainer.FindElement(AContainer.GetExternalName(propTypItm)) as TPasType; if Assigned(propTypItm) then begin - if propTypItm.InheritsFrom(TPasUnresolvedTypeRef) then - propTypItm := AContainer.FindElement(AContainer.GetExternalName(propTypItm)) as TPasType; //prop_ns_shortName := GetNameSpaceShortName(GetTypeNameSpace(AContainer,propTypItm),ADocument,GetOwner().GetPreferedShortNames()); propItmUltimeType := GetUltimeType(propTypItm); isEmbeddedArray := propItmUltimeType.InheritsFrom(TPasArrayType) and