diff options
| author | Gregor Jasny <gjasny@googlemail.com> | 2016-06-26 22:00:00 +0200 |
|---|---|---|
| committer | Gregor Jasny <gjasny@googlemail.com> | 2016-06-26 22:00:00 +0200 |
| commit | 2ca76a6651dd16586334067f6a41524a4015adc9 (patch) | |
| tree | 3b166af5ccf81ef640bf03dad6fc97f129e063b0 /Source/cmGetPropertyCommand.cxx | |
| parent | c68cf9e4d111fa7c92973acec92d71ce6d187ff9 (diff) | |
| download | cmake-2ca76a6651dd16586334067f6a41524a4015adc9.tar.gz | |
Validate target name in ALIASED_TARGET property getter
Diffstat (limited to 'Source/cmGetPropertyCommand.cxx')
| -rw-r--r-- | Source/cmGetPropertyCommand.cxx | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/Source/cmGetPropertyCommand.cxx b/Source/cmGetPropertyCommand.cxx index 06f7504468..67b0e9da78 100644 --- a/Source/cmGetPropertyCommand.cxx +++ b/Source/cmGetPropertyCommand.cxx @@ -248,15 +248,14 @@ bool cmGetPropertyCommand::HandleTargetMode() return false; } - if (this->PropertyName == "ALIASED_TARGET") { - if (this->Makefile->IsAlias(this->Name)) { - if (cmTarget* target = this->Makefile->FindTargetToUse(this->Name)) { + if (cmTarget* target = this->Makefile->FindTargetToUse(this->Name)) { + if (this->PropertyName == "ALIASED_TARGET") { + if (this->Makefile->IsAlias(this->Name)) { return this->StoreResult(target->GetName().c_str()); + } else { + return this->StoreResult((this->Variable + "-NOTFOUND").c_str()); } } - return this->StoreResult((this->Variable + "-NOTFOUND").c_str()); - } - if (cmTarget* target = this->Makefile->FindTargetToUse(this->Name)) { return this->StoreResult( target->GetProperty(this->PropertyName, this->Makefile)); } else { |