From 694b1e4425d930c471350b10cf22a93124a698bd Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Sat, 24 Jan 2009 19:49:13 +0000 Subject: [PATCH] fix a fixme, don't leak the expr on error. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@62927 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Sema/SemaExpr.cpp | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp index 9a4977d09b..fa4c9d620a 100644 --- a/lib/Sema/SemaExpr.cpp +++ b/lib/Sema/SemaExpr.cpp @@ -1049,18 +1049,23 @@ Sema::ActOnSizeOfAlignOfExpr(SourceLocation OpLoc, bool isSizeof, bool isType, if (isType) { ArgTy = QualType::getFromOpaquePtr(TyOrEx); Range = ArgRange; + + // Verify that the operand is valid. + if (CheckSizeOfAlignOfOperand(ArgTy, OpLoc, Range, isSizeof)) + return ExprError(); } else { // Get the end location. Expr *ArgEx = (Expr *)TyOrEx; Range = ArgEx->getSourceRange(); ArgTy = ArgEx->getType(); + + // Verify that the operand is valid. + if (CheckSizeOfAlignOfOperand(ArgTy, OpLoc, Range, isSizeof)) { + DeleteExpr(ArgEx); + return ExprError(); + } } - // Verify that the operand is valid. - // FIXME: This might leak the expression. - if (CheckSizeOfAlignOfOperand(ArgTy, OpLoc, Range, isSizeof)) - return ExprError(); - // C99 6.5.3.4p4: the type (an unsigned integer type) is size_t. return Owned(new (Context) SizeOfAlignOfExpr(isSizeof, isType, TyOrEx, Context.getSizeType(), OpLoc, -- 2.40.0