summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlan Alpert <aalpert@blackberry.com>2013-04-12 15:34:11 -0700
committerPeter Hartmann <phartmann@blackberry.com>2013-05-07 16:42:45 +0200
commitc440da53081760c7a3d23f7a4994842327d66db9 (patch)
tree28027109b91df998289f780b8b4a5db1a6573264
parent5da691d8d4c2bc5192ecd8d7343b323da991c41b (diff)
[BB10-internal] Workaround for PR 318290
Hard to reproduce crashes on application exit are being worked around by leaking the memory (safe, as this should only occur on application exit when the memory will be cleaned up at a process level shortly). Change-Id: I6525a39edc772277b8d92820f520542fcdc4580a Signed-off-by: Peter Hartmann <phartmann@blackberry.com>
-rw-r--r--src/script/api/qscriptengine_p.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/script/api/qscriptengine_p.h b/src/script/api/qscriptengine_p.h
index b308b1b026..37a09bd4f0 100644
--- a/src/script/api/qscriptengine_p.h
+++ b/src/script/api/qscriptengine_p.h
@@ -803,8 +803,10 @@ inline void QScriptValuePrivate::operator delete(void *ptr)
QScriptValuePrivate *d = reinterpret_cast<QScriptValuePrivate*>(ptr);
if (d->engine)
d->engine->freeScriptValuePrivate(d);
+#ifndef Q_OS_BLACKBERRY //Workaround for PR318290
else
qFree(d);
+#endif
}
inline void QScriptEnginePrivate::saveException(JSC::ExecState *exec, JSC::JSValue *val)