From owner-svn-src-stable-9@FreeBSD.ORG Wed Feb 25 17:54:19 2015 Return-Path: Delivered-To: svn-src-stable-9@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 59F5AAC9; Wed, 25 Feb 2015 17:54:19 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 299F4CDB; Wed, 25 Feb 2015 17:54:19 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t1PHsIaZ035973; Wed, 25 Feb 2015 17:54:18 GMT (envelope-from dim@FreeBSD.org) Received: (from dim@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t1PHsI9X035972; Wed, 25 Feb 2015 17:54:18 GMT (envelope-from dim@FreeBSD.org) Message-Id: <201502251754.t1PHsI9X035972@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: dim set sender to dim@FreeBSD.org using -f From: Dimitry Andric Date: Wed, 25 Feb 2015 17:54:18 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org Subject: svn commit: r279290 - in stable: 10/contrib/llvm/patches 9/contrib/llvm/patches X-SVN-Group: stable-9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-9@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for only the 9-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 25 Feb 2015 17:54:19 -0000 Author: dim Date: Wed Feb 25 17:54:18 2015 New Revision: 279290 URL: https://svnweb.freebsd.org/changeset/base/279290 Log: Add clang patches corresponding to r279289. Added: stable/9/contrib/llvm/patches/patch-r279289-clang-r199571-fix-string-literal-assertion.diff Changes in other areas also in this revision: Added: stable/10/contrib/llvm/patches/patch-r279289-clang-r199571-fix-string-literal-assertion.diff Added: stable/9/contrib/llvm/patches/patch-r279289-clang-r199571-fix-string-literal-assertion.diff ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ stable/9/contrib/llvm/patches/patch-r279289-clang-r199571-fix-string-literal-assertion.diff Wed Feb 25 17:54:18 2015 (r279290) @@ -0,0 +1,31 @@ +Pull in r199571 from upstream clang trunk (by Ted Kremenek): + + Harden InitListExpr::isStringLiteralInit() against getInit() + returning null. + + This led to a crash on invalid code (sorry, no good test case). + + Fixes . + +This fixes an assertion when compiling certain incorrect code, as +reported upstream in http://llvm.org/PR22684 . + +Introduced here: http://svnweb.freebsd.org/changeset/base/279289 + +Index: tools/clang/lib/AST/Expr.cpp +=================================================================== +--- tools/clang/lib/AST/Expr.cpp ++++ tools/clang/lib/AST/Expr.cpp +@@ -1892,7 +1892,11 @@ bool InitListExpr::isStringLiteralInit() const { + const ArrayType *AT = getType()->getAsArrayTypeUnsafe(); + if (!AT || !AT->getElementType()->isIntegerType()) + return false; +- const Expr *Init = getInit(0)->IgnoreParens(); ++ // It is possible for getInit() to return null. ++ const Expr *Init = getInit(0); ++ if (!Init) ++ return false; ++ Init = Init->IgnoreParens(); + return isa(Init) || isa(Init); + } +