diff options
| author | Peter Hartmann <peter.hartmann@nokia.com> | 2009-10-26 12:10:13 (GMT) |
|---|---|---|
| committer | Peter Hartmann <peter.hartmann@nokia.com> | 2009-10-26 12:10:13 (GMT) |
| commit | 2b46eff0e7f7d11cf957b9b180177cc4b368c9aa (patch) | |
| tree | 03e166e8393e1928ec5ed3c79c96fa0accd11460 /src/3rdparty/webkit/JavaScriptCore/runtime/JSValue.cpp | |
| parent | e1f691d84dad17c5ee47c97c31ae743093ad8bc9 (diff) | |
| parent | e2ef97128c006ac2a5c99c67bb54eebaa3b45720 (diff) | |
| download | Qt-2b46eff0e7f7d11cf957b9b180177cc4b368c9aa.zip Qt-2b46eff0e7f7d11cf957b9b180177cc4b368c9aa.tar.gz Qt-2b46eff0e7f7d11cf957b9b180177cc4b368c9aa.tar.bz2 | |
Merge commit 'origin/4.6' into core-4.6
Diffstat (limited to 'src/3rdparty/webkit/JavaScriptCore/runtime/JSValue.cpp')
| -rw-r--r-- | src/3rdparty/webkit/JavaScriptCore/runtime/JSValue.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/3rdparty/webkit/JavaScriptCore/runtime/JSValue.cpp b/src/3rdparty/webkit/JavaScriptCore/runtime/JSValue.cpp index 39a4093..699c1cd 100644 --- a/src/3rdparty/webkit/JavaScriptCore/runtime/JSValue.cpp +++ b/src/3rdparty/webkit/JavaScriptCore/runtime/JSValue.cpp @@ -110,7 +110,10 @@ char* JSValue::description() { static const size_t size = 32; static char description[size]; - if (isInt32()) + + if (!*this) + snprintf(description, size, "<JSValue()>"); + else if (isInt32()) snprintf(description, size, "Int32: %d", asInt32()); else if (isDouble()) snprintf(description, size, "Double: %lf", asDouble()); |