From 6d1acac613d59ecd1c48e3577ed42facb38a5e5a Mon Sep 17 00:00:00 2001 From: Konstantin Ritt Date: Sun, 25 Nov 2012 05:54:45 +0200 Subject: moc: Fix assertion in QVector::first() introduced in aea68c93ae437a761584719f0f1ca93eaf6f7484 Change-Id: I05c1dfa16c42019ee0a0b44ffc50ad2c2c0d209b Reviewed-by: Lars Knoll --- src/tools/moc/preprocessor.cpp | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) (limited to 'src/tools/moc') diff --git a/src/tools/moc/preprocessor.cpp b/src/tools/moc/preprocessor.cpp index 72fecf0a46..f30683c629 100644 --- a/src/tools/moc/preprocessor.cpp +++ b/src/tools/moc/preprocessor.cpp @@ -1099,12 +1099,16 @@ void Preprocessor::preprocess(const QByteArray &filename, Symbols &preprocessed) (macro.symbols.last().token == PP_WHITESPACE || macro.symbols.last().token == WHITESPACE)) macro.symbols.pop_back(); - if (macro.symbols.first().token == PP_HASHHASH || - macro.symbols.last().token == PP_HASHHASH) - error("'##' cannot appear at either end of a macro expansion"); - if (macro.symbols.last().token == HASH || - macro.symbols.last().token == PP_HASH) - error("'#' is not followed by a macro parameter"); + if (!macro.symbols.isEmpty()) { + if (macro.symbols.first().token == PP_HASHHASH || + macro.symbols.last().token == PP_HASHHASH) { + error("'##' cannot appear at either end of a macro expansion"); + } + if (macro.symbols.last().token == HASH || + macro.symbols.last().token == PP_HASH) { + error("'#' is not followed by a macro parameter"); + } + } macros.insert(name, macro); continue; } -- cgit v1.2.3