summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergio Martins <sergio.martins@kdab.com>2014-06-16 15:44:34 +0100
committerAllan Sandfeld Jensen <allan.jensen@digia.com>2014-06-25 00:06:30 +0200
commit789593fb8751a49ed84c64f3cabce4de2fba0793 (patch)
tree0d9051a02cf830271a47777bd89de246f7fab5d5
parentc1e20c0a8fe195357cb9f2f423f5ea3bd0dad8fa (diff)
downloadqtwebkit-789593fb8751a49ed84c64f3cabce4de2fba0793.tar.gz
Fix WebView crash when using gcc 4.9.
Fix copied from https://code.google.com/p/angleproject/issues/detail?id=651 Task-number: QTBUG-39723 Change-Id: I8ee694079c263bf6d21e2a0eadc2234a2c69cae2 Reviewed-by: Allan Sandfeld Jensen <allan.jensen@digia.com>
-rw-r--r--Source/ThirdParty/ANGLE/src/compiler/SymbolTable.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/ThirdParty/ANGLE/src/compiler/SymbolTable.cpp b/Source/ThirdParty/ANGLE/src/compiler/SymbolTable.cpp
index 51180aff6..42e8998c5 100644
--- a/Source/ThirdParty/ANGLE/src/compiler/SymbolTable.cpp
+++ b/Source/ThirdParty/ANGLE/src/compiler/SymbolTable.cpp
@@ -171,7 +171,8 @@ TFunction::~TFunction()
TSymbolTableLevel::~TSymbolTableLevel()
{
for (tLevel::iterator it = level.begin(); it != level.end(); ++it)
- delete (*it).second;
+ if ((*it).first == (*it).second->getMangledName())
+ delete (*it).second;
}
//