[cfe-commits] r153792 - in /cfe/trunk: test/Index/index-attrs.m tools/libclang/IndexingContext.cpp tools/libclang/IndexingContext.h
Argyrios Kyrtzidis
akyrtzi at gmail.com
Fri Mar 30 18:14:06 PDT 2012
Author: akirtzidis
Date: Fri Mar 30 20:14:06 2012
New Revision: 153792
URL: http://llvm.org/viewvc/llvm-project?rev=153792&view=rev
Log:
[libclang] Fix use-after-free bug when handling attributes indexing info.
When indexing a property with a getter/setter with attributes, the allocated memory
for AttrListInfo could get released before its destructor is run.
Fixes rdar://11113442.
Modified:
cfe/trunk/test/Index/index-attrs.m
cfe/trunk/tools/libclang/IndexingContext.cpp
cfe/trunk/tools/libclang/IndexingContext.h
Modified: cfe/trunk/test/Index/index-attrs.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Index/index-attrs.m?rev=153792&r1=153791&r2=153792&view=diff
==============================================================================
--- cfe/trunk/test/Index/index-attrs.m (original)
+++ cfe/trunk/test/Index/index-attrs.m Fri Mar 30 20:14:06 2012
@@ -3,5 +3,15 @@
@property (retain) __attribute__((iboutletcollection(Foo))) Foo *prop;
@end
+ at interface I
+-(id)prop __attribute__((annotate("anno")));
+-(void)setProp:(id)p __attribute__((annotate("anno")));
+ at property (assign) id prop __attribute__((annotate("anno")));
+ at end
+
// RUN: c-index-test -index-file %s | FileCheck %s
// CHECK: <attribute>: attribute(iboutletcollection)= [IBOutletCollection=ObjCInterface]
+
+// CHECK: <attribute>: attribute(annotate)=anno
+// CHECK: <getter>: kind: objc-instance-method | name: prop | {{.*}} <attribute>: attribute(annotate)=anno
+// CHECK: <setter>: kind: objc-instance-method | name: setProp: | {{.*}} <attribute>: attribute(annotate)=anno
Modified: cfe/trunk/tools/libclang/IndexingContext.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/libclang/IndexingContext.cpp?rev=153792&r1=153791&r2=153792&view=diff
==============================================================================
--- cfe/trunk/tools/libclang/IndexingContext.cpp (original)
+++ cfe/trunk/tools/libclang/IndexingContext.cpp Fri Mar 30 20:14:06 2012
@@ -61,9 +61,9 @@
IBCollInfo.objcClass = 0;
}
-AttrListInfo::AttrListInfo(const Decl *D,
- IndexingContext &IdxCtx,
- ScratchAlloc &SA) : ref_cnt(0) {
+AttrListInfo::AttrListInfo(const Decl *D, IndexingContext &IdxCtx)
+ : SA(IdxCtx), ref_cnt(0) {
+
if (!D->hasAttrs())
return;
@@ -113,19 +113,11 @@
CXAttrs.push_back(&Attrs[i]);
}
-AttrListInfo::AttrListInfo(const AttrListInfo &other) {
- assert(other.ref_cnt == 0 &&
- "Should not copy an AttrListInfo that is ref-counted");
- ref_cnt = 0;
-
- Attrs = other.Attrs;
- IBCollAttrs = other.IBCollAttrs;
-
- for (unsigned i = 0, e = IBCollAttrs.size(); i != e; ++i)
- CXAttrs.push_back(&IBCollAttrs[i]);
-
- for (unsigned i = 0, e = Attrs.size(); i != e; ++i)
- CXAttrs.push_back(&Attrs[i]);
+IntrusiveRefCntPtr<AttrListInfo>
+AttrListInfo::create(const Decl *D, IndexingContext &IdxCtx) {
+ ScratchAlloc SA(IdxCtx);
+ AttrListInfo *attrs = SA.allocate<AttrListInfo>();
+ return new (attrs) AttrListInfo(D, IdxCtx);
}
IndexingContext::CXXBasesListInfo::CXXBasesListInfo(const CXXRecordDecl *D,
@@ -281,9 +273,8 @@
DInfo.loc = getIndexLoc(Loc);
DInfo.isImplicit = D->isImplicit();
- AttrListInfo AttrList(D, *this, SA);
- DInfo.attributes = AttrList.getAttrs();
- DInfo.numAttributes = AttrList.getNumAttrs();
+ DInfo.attributes = DInfo.EntInfo.attributes;
+ DInfo.numAttributes = DInfo.EntInfo.numAttributes;
getContainerInfo(D->getDeclContext(), DInfo.SemanticContainer);
DInfo.semanticContainer = &DInfo.SemanticContainer;
@@ -443,9 +434,10 @@
}
bool IndexingContext::handleObjCCategory(const ObjCCategoryDecl *D) {
+ ScratchAlloc SA(*this);
+
ObjCCategoryDeclInfo CatDInfo(/*isImplementation=*/false);
EntityInfo ClassEntity;
- ScratchAlloc SA(*this);
const ObjCInterfaceDecl *IFaceD = D->getClassInterface();
SourceLocation ClassLoc = D->getLocation();
SourceLocation CategoryLoc = D->IsClassExtension() ? ClassLoc
@@ -474,10 +466,11 @@
}
bool IndexingContext::handleObjCCategoryImpl(const ObjCCategoryImplDecl *D) {
+ ScratchAlloc SA(*this);
+
const ObjCCategoryDecl *CatD = D->getCategoryDecl();
ObjCCategoryDeclInfo CatDInfo(/*isImplementation=*/true);
EntityInfo ClassEntity;
- ScratchAlloc SA(*this);
const ObjCInterfaceDecl *IFaceD = CatD->getClassInterface();
SourceLocation ClassLoc = D->getLocation();
SourceLocation CategoryLoc = D->getCategoryNameLoc();
@@ -522,10 +515,11 @@
}
bool IndexingContext::handleObjCProperty(const ObjCPropertyDecl *D) {
+ ScratchAlloc SA(*this);
+
ObjCPropertyDeclInfo DInfo;
EntityInfo GetterEntity;
EntityInfo SetterEntity;
- ScratchAlloc SA(*this);
DInfo.ObjCPropDeclInfo.declInfo = &DInfo;
@@ -846,11 +840,9 @@
EntityInfo.lang = CXIdxEntityLang_C;
if (D->hasAttrs()) {
- AttrListInfo *attrs = SA.allocate<AttrListInfo>();
- new (attrs) AttrListInfo(D, *this, SA);
- EntityInfo.AttrList = attrs;
- EntityInfo.attributes = attrs->getAttrs();
- EntityInfo.numAttributes = attrs->getNumAttrs();
+ EntityInfo.AttrList = AttrListInfo::create(D, *this);
+ EntityInfo.attributes = EntityInfo.AttrList->getAttrs();
+ EntityInfo.numAttributes = EntityInfo.AttrList->getNumAttrs();
}
if (const TagDecl *TD = dyn_cast<TagDecl>(D)) {
Modified: cfe/trunk/tools/libclang/IndexingContext.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/libclang/IndexingContext.h?rev=153792&r1=153791&r2=153792&view=diff
==============================================================================
--- cfe/trunk/tools/libclang/IndexingContext.h (original)
+++ cfe/trunk/tools/libclang/IndexingContext.h Fri Mar 30 20:14:06 2012
@@ -25,9 +25,24 @@
namespace cxindex {
class IndexingContext;
- class ScratchAlloc;
class AttrListInfo;
+class ScratchAlloc {
+ IndexingContext &IdxCtx;
+
+public:
+ explicit ScratchAlloc(IndexingContext &indexCtx);
+ ScratchAlloc(const ScratchAlloc &SA);
+
+ ~ScratchAlloc();
+
+ const char *toCStr(StringRef Str);
+ const char *copyCStr(StringRef Str);
+
+ template <typename T>
+ T *allocate();
+};
+
struct EntityInfo : public CXIdxEntityInfo {
const NamedDecl *Dcl;
IndexingContext *IndexCtx;
@@ -229,16 +244,20 @@
};
class AttrListInfo {
+ ScratchAlloc SA;
+
SmallVector<AttrInfo, 2> Attrs;
SmallVector<IBOutletCollectionInfo, 2> IBCollAttrs;
SmallVector<CXIdxAttrInfo *, 2> CXAttrs;
unsigned ref_cnt;
+ AttrListInfo(const AttrListInfo&); // DO NOT IMPLEMENT
+ void operator=(const AttrListInfo&); // DO NOT IMPLEMENT
public:
- AttrListInfo(const Decl *D,
- IndexingContext &IdxCtx,
- ScratchAlloc &SA);
- AttrListInfo(const AttrListInfo &other);
+ AttrListInfo(const Decl *D, IndexingContext &IdxCtx);
+
+ static IntrusiveRefCntPtr<AttrListInfo> create(const Decl *D,
+ IndexingContext &IdxCtx);
const CXIdxAttrInfo *const *getAttrs() const {
if (CXAttrs.empty())
@@ -488,28 +507,23 @@
static bool shouldIgnoreIfImplicit(const Decl *D);
};
-class ScratchAlloc {
- IndexingContext &IdxCtx;
-
-public:
- explicit ScratchAlloc(IndexingContext &indexCtx) : IdxCtx(indexCtx) {
- ++IdxCtx.StrAdapterCount;
- }
-
- ~ScratchAlloc() {
- --IdxCtx.StrAdapterCount;
- if (IdxCtx.StrAdapterCount == 0)
- IdxCtx.StrScratch.Reset();
- }
+inline ScratchAlloc::ScratchAlloc(IndexingContext &idxCtx) : IdxCtx(idxCtx) {
+ ++IdxCtx.StrAdapterCount;
+}
+inline ScratchAlloc::ScratchAlloc(const ScratchAlloc &SA) : IdxCtx(SA.IdxCtx) {
+ ++IdxCtx.StrAdapterCount;
+}
- const char *toCStr(StringRef Str);
- const char *copyCStr(StringRef Str);
+inline ScratchAlloc::~ScratchAlloc() {
+ --IdxCtx.StrAdapterCount;
+ if (IdxCtx.StrAdapterCount == 0)
+ IdxCtx.StrScratch.Reset();
+}
- template <typename T>
- T *allocate() {
- return IdxCtx.StrScratch.Allocate<T>();
- }
-};
+template <typename T>
+inline T *ScratchAlloc::allocate() {
+ return IdxCtx.StrScratch.Allocate<T>();
+}
}} // end clang::cxindex
More information about the cfe-commits
mailing list