diff options
| author | Kent Hansen <kent.hansen@nokia.com> | 2012-06-01 21:05:31 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-01 21:42:38 +0200 |
| commit | b2969c97fd808e229ff57949dbb9c683f3830b71 (patch) | |
| tree | f923eff172847907b7a37301f68e9c2850155d84 /src | |
| parent | 44062ea8e2499f8d2061c7e5be8fb754f2ba4310 (diff) | |
| download | qtscript-b2969c97fd808e229ff57949dbb9c683f3830b71.tar.gz | |
Fix crash when converting invalid JSValue to string
JSC::JSValue::toString() expects that the input is valid.
Task-number: QTBUG-21896
Change-Id: I3199fcba94be5426cb3d193b57d16176daae83a0
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/script/api/qscriptengine_p.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/script/api/qscriptengine_p.h b/src/script/api/qscriptengine_p.h index df52ee8..6c82522 100644 --- a/src/script/api/qscriptengine_p.h +++ b/src/script/api/qscriptengine_p.h @@ -1031,6 +1031,8 @@ inline quint16 QScriptEnginePrivate::toUInt16(JSC::ExecState *exec, JSC::JSValue inline JSC::UString QScriptEnginePrivate::toString(JSC::ExecState *exec, JSC::JSValue value) { + if (!value) + return JSC::UString(); JSC::JSValue savedException; saveException(exec, &savedException); JSC::UString str = value.toString(exec); |