From 8a0ed0016566434ba605b0ae0fbc275dbe14e323 Mon Sep 17 00:00:00 2001 From: David Majnemer Date: Fri, 18 Jul 2014 05:43:12 +0000 Subject: [PATCH] Parse: Diagnose malformed 'message' arguments for 'availability' attr The parsing code for 'availability' wasn't prepared for string literals like "a" L"b" showing up. Error if this occurs. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@213350 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Parse/ParseDecl.cpp | 13 ++++++++++++- test/Parser/attr-availability.c | 2 ++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/lib/Parse/ParseDecl.cpp b/lib/Parse/ParseDecl.cpp index 71b37527fd..74df162b0b 100644 --- a/lib/Parse/ParseDecl.cpp +++ b/lib/Parse/ParseDecl.cpp @@ -825,13 +825,24 @@ void Parser::ParseAvailabilityAttribute(IdentifierInfo &Availability, } ConsumeToken(); if (Keyword == Ident_message) { - if (Tok.isNot(tok::string_literal)) { // Also reject wide string literals. + if (Tok.isNot(tok::string_literal)) { Diag(Tok, diag::err_expected_string_literal) << /*Source='availability attribute'*/2; SkipUntil(tok::r_paren, StopAtSemi); return; } MessageExpr = ParseStringLiteralExpression(); + // Also reject wide string literals. + if (StringLiteral *MessageStringLiteral = + cast_or_null(MessageExpr.get())) { + if (MessageStringLiteral->getCharByteWidth() != 1) { + Diag(MessageStringLiteral->getSourceRange().getBegin(), + diag::err_expected_string_literal) + << /*Source='availability attribute'*/ 2; + SkipUntil(tok::r_paren, StopAtSemi); + return; + } + } break; } diff --git a/test/Parser/attr-availability.c b/test/Parser/attr-availability.c index 06bebbad5c..d812296d93 100644 --- a/test/Parser/attr-availability.c +++ b/test/Parser/attr-availability.c @@ -20,6 +20,8 @@ void f6() __attribute__((availability(macosx,unavailable,introduced=10.5))); // void f7() __attribute__((availability(macosx,message=L"wide"))); // expected-error {{expected string literal for optional message in 'availability' attribute}} +void f8() __attribute__((availability(macosx,message="a" L"b"))); // expected-error {{expected string literal for optional message in 'availability' attribute}} + // rdar://10095131 enum E{ gorf __attribute__((availability(macosx,introduced=8.5, message = 10.0))), // expected-error {{expected string literal for optional message in 'availability' attribute}} -- 2.40.0