From fa601425207383bf635b3623838c662e09b771f5 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Thu, 27 Jun 2013 12:19:50 +0200 Subject: Fix another failing assertion with MSVC's STL in debug mode Try to avoid derefencing an empty vector, even when the result is not used. Change-Id: I8a8d8363f42dc3cea8ee702dc8555494b67a165d Reviewed-by: Lars Knoll --- src/3rdparty/masm/yarr/YarrJIT.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/3rdparty/masm/yarr') diff --git a/src/3rdparty/masm/yarr/YarrJIT.cpp b/src/3rdparty/masm/yarr/YarrJIT.cpp index d36cd956de..fd05d81a31 100644 --- a/src/3rdparty/masm/yarr/YarrJIT.cpp +++ b/src/3rdparty/masm/yarr/YarrJIT.cpp @@ -212,7 +212,7 @@ class YarrGenerator : private MacroAssembler { if (charClass->m_ranges.size()) { unsigned matchIndex = 0; JumpList failures; - matchCharacterClassRange(character, failures, matchDest, &charClass->m_ranges[0], charClass->m_ranges.size(), &matchIndex, &charClass->m_matches[0], charClass->m_matches.size()); + matchCharacterClassRange(character, failures, matchDest, &charClass->m_ranges[0], charClass->m_ranges.size(), &matchIndex, charClass->m_matches.isEmpty() ? 0 : &charClass->m_matches[0], charClass->m_matches.size()); while (matchIndex < charClass->m_matches.size()) matchDest.append(branch32(Equal, character, Imm32((unsigned short)charClass->m_matches[matchIndex++]))); -- cgit v1.2.3