OSDN Git Service
(root)
/
kde
/
Katie.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f5f79c1
)
account for undefined types in QScriptEnginePrivate::create() assert
author
Ivailo Monev
<xakepa10@gmail.com>
Tue, 8 Nov 2022 15:39:13 +0000
(17:39 +0200)
committer
Ivailo Monev
<xakepa10@gmail.com>
Tue, 8 Nov 2022 15:39:13 +0000
(17:39 +0200)
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
src/script/api/qscriptengine.cpp
patch
|
blob
|
history
diff --git
a/src/script/api/qscriptengine.cpp
b/src/script/api/qscriptengine.cpp
index
88b5a72
..
ba10133
100644
(file)
--- a/
src/script/api/qscriptengine.cpp
+++ b/
src/script/api/qscriptengine.cpp
@@
-2885,7
+2885,7
@@
QScriptValue QScriptEngine::create(int type, const void *ptr)
JSC::JSValue QScriptEnginePrivate::create(JSC::ExecState *exec, int type, const void *ptr)
{
- Q_ASSERT(ptr != 0);
+ Q_ASSERT(ptr != 0
|| type == 0
);
JSC::JSValue result;
QScriptEnginePrivate *eng = exec ? QScript::scriptEngineFromExec(exec) : 0;
QScriptTypeInfo *info = eng ? eng->m_typeInfos.value(type) : 0;