summaryrefslogtreecommitdiff
path: root/cli_ure/source
diff options
context:
space:
mode:
authorPeter Foley <pefoley2@verizon.net>2012-08-20 19:13:48 -0400
committerTor Lillqvist <tml@iki.fi>2012-08-22 04:17:24 +0000
commitb6e1a001df60cc3f606d3f7fc361367feb13edaf (patch)
tree16d9a95db8ffcebb4a57d00ae293c8e083ccfd50 /cli_ure/source
parent6fa1a74ec4bb5820d1638ff3b872476f8652efe0 (diff)
fix StackOverflowException in climaker
Change-Id: I640eddb4496d295d3cea9f45875b415d419060f4 Reviewed-on: https://gerrit.libreoffice.org/448 Reviewed-by: Tor Lillqvist <tml@iki.fi> Tested-by: Tor Lillqvist <tml@iki.fi>
Diffstat (limited to 'cli_ure/source')
-rwxr-xr-xcli_ure/source/climaker/climaker_emit.cxx15
1 files changed, 6 insertions, 9 deletions
diff --git a/cli_ure/source/climaker/climaker_emit.cxx b/cli_ure/source/climaker/climaker_emit.cxx
index db1e6abbf98e..8c3768e20495 100755
--- a/cli_ure/source/climaker/climaker_emit.cxx
+++ b/cli_ure/source/climaker/climaker_emit.cxx
@@ -277,15 +277,12 @@ Assembly ^ TypeEmitter::type_resolve(
::System::Object ^, ::System::ResolveEventArgs ^ args )
{
::System::String ^ cts_name = args->Name;
- ::System::Type ^ ret_type = m_module_builder->GetType(
- cts_name, false /* no exc */ );
- if (nullptr == ret_type)
- {
- iface_entry ^ entry = dynamic_cast< iface_entry ^ >(
- m_incomplete_ifaces[cts_name] );
- if (nullptr != entry)
- ret_type = entry->m_type_builder;
- }
+ ::System::Type ^ ret_type;
+
+ iface_entry ^ entry = dynamic_cast< iface_entry ^ >(m_incomplete_ifaces[cts_name] );
+ if (nullptr != entry)
+ ret_type = entry->m_type_builder;
+
if (nullptr == ret_type)
{
sal_Int32 len = m_extra_assemblies->Length;