fix a crasher where an invalid program that multiply defined
a protocol could smash more references in than are allocated.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@48411 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Sema/SemaDeclObjC.cpp b/lib/Sema/SemaDeclObjC.cpp
index af57d09..3b8baea 100644
--- a/lib/Sema/SemaDeclObjC.cpp
+++ b/lib/Sema/SemaDeclObjC.cpp
@@ -202,17 +202,19 @@
ObjCProtocolDecl *PDecl = ObjCProtocols[ProtocolName];
if (PDecl) {
// Protocol already seen. Better be a forward protocol declaration
- if (!PDecl->isForwardDecl())
+ if (!PDecl->isForwardDecl()) {
Diag(ProtocolLoc, diag::err_duplicate_protocol_def,
ProtocolName->getName());
- else {
- PDecl->setForwardDecl(false);
- PDecl->AllocReferencedProtocols(NumProtoRefs);
+ // Just return the protocol we already had.
+ // FIXME: don't leak the objects passed in!
+ return PDecl;
}
- }
- else {
+
+ PDecl->setForwardDecl(false);
+ PDecl->AllocReferencedProtocols(NumProtoRefs);
+ } else {
PDecl = ObjCProtocolDecl::Create(Context, AtProtoInterfaceLoc, NumProtoRefs,
- ProtocolName);
+ ProtocolName, false);
ObjCProtocols[ProtocolName] = PDecl;
}