diff options
| -rw-r--r-- | clang/lib/Analysis/Store.cpp | 27 | ||||
| -rw-r--r-- | clang/test/Analysis/misc-ps.m | 14 |
2 files changed, 38 insertions, 3 deletions
diff --git a/clang/lib/Analysis/Store.cpp b/clang/lib/Analysis/Store.cpp index d7633a46ac9..ad6bd7e4f66 100644 --- a/clang/lib/Analysis/Store.cpp +++ b/clang/lib/Analysis/Store.cpp @@ -45,6 +45,24 @@ static bool IsCompleteType(ASTContext &Ctx, QualType Ty) { return true; } +static bool isVoidOrHigherOrderVoidPtr(ASTContext &Ctx, QualType Ty) { + while (true) { + Ty = Ctx.getCanonicalType(Ty); + + if (Ty->isVoidType()) + return true; + + if (const PointerType *PT = Ty->getAsPointerType()) { + Ty = PT->getPointeeType(); + continue; + } + + break; + } + + return false; +} + StoreManager::CastResult StoreManager::NewCastRegion(const GRState *state, const MemRegion* R, QualType CastToTy) { @@ -64,6 +82,10 @@ StoreManager::NewCastRegion(const GRState *state, const MemRegion* R, // already be handled. QualType PointeeTy = CastToTy->getAsPointerType()->getPointeeType(); + // Casts to 'void*', 'void**', 'void***', etc., should just pass through. + if (isVoidOrHigherOrderVoidPtr(Ctx, PointeeTy)) + return CastResult(state, R); + // Process region cast according to the kind of the region being cast. switch (R->getKind()) { case MemRegion::BEG_TYPED_REGIONS: @@ -78,9 +100,8 @@ StoreManager::NewCastRegion(const GRState *state, const MemRegion* R, case MemRegion::CodeTextRegionKind: { // CodeTextRegion should be cast to only function pointer type. - assert(CastToTy->isFunctionPointerType() || CastToTy->isBlockPointerType() - || (CastToTy->isPointerType() && - CastToTy->getAsPointerType()->getPointeeType()->isVoidType())); + assert(CastToTy->isFunctionPointerType() || + CastToTy->isBlockPointerType()); break; } diff --git a/clang/test/Analysis/misc-ps.m b/clang/test/Analysis/misc-ps.m index 5e063d07fda..19d76228054 100644 --- a/clang/test/Analysis/misc-ps.m +++ b/clang/test/Analysis/misc-ps.m @@ -324,3 +324,17 @@ void test_rdar_7034511(NSArray *y) { if (x == ((void*) 0)) {} } +// Handle arbitrary void*^n -> void*^m casts. This was previously causing +// a crash in CastRegion. +void handle_higher_order_voidptr_casts() { + void **ptr; + typedef void *PVOID; + typedef long INT_PTR, *PINT_PTR; + typedef INT_PTR (*FARPROC)(); + FARPROC handle_higher_order_voidptr_casts_aux(); + PVOID handle_higher_order_voidptr_casts_aux_2(PVOID volatile *x); + + ptr = (void**) handle_higher_order_voidptr_casts_aux(); + handle_higher_order_voidptr_casts_aux_2(ptr); +} + |
