Changeset 57626 in webkit

Timestamp:

Apr 14, 2010 8:07:49 PM (14 years ago)

Author:

eric@webkit.org

Message:

2010-04-14 Jedrzej Nowacki <​jedrzej.nowacki@nokia.com>

Reviewed by Kenneth Rohde Christiansen.

Fix a few memory leaks in QScriptEngine.

Syntax checking caused memory leak, not all temporary variables were released.

[Qt] Syntax checking in the QtScript cause a memory leak.
​https://bugs.webkit.org/show_bug.cgi?id=37610

• qt/api/qscriptengine_p.cpp: (QScriptEnginePrivate::checkSyntax):
• qt/api/qscriptsyntaxcheckresult.cpp: (QScriptSyntaxCheckResultPrivate::errorMessage): (QScriptSyntaxCheckResultPrivate::errorLineNumber):

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• qt/api/qscriptengine_p.cpp (modified) (1 diff)
• qt/api/qscriptsyntaxcheckresult.cpp (modified) (2 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2010-04-14  Jedrzej Nowacki  <jedrzej.nowacki@nokia.com>
+
+        Reviewed by Kenneth Rohde Christiansen.
+
+        Fix a few memory leaks in QScriptEngine.
+
+        Syntax checking caused memory leak, not all temporary variables were released.
+
+        [Qt] Syntax checking  in the QtScript cause a memory leak.
+        https://bugs.webkit.org/show_bug.cgi?id=37610
+
+        * qt/api/qscriptengine_p.cpp:
+        (QScriptEnginePrivate::checkSyntax):
+        * qt/api/qscriptsyntaxcheckresult.cpp:
+        (QScriptSyntaxCheckResultPrivate::errorMessage):
+        (QScriptSyntaxCheckResultPrivate::errorLineNumber):
+
 2010-04-14  Jedrzej Nowacki  <jedrzej.nowacki@nokia.com>
 

trunk/JavaScriptCore/qt/api/qscriptengine_p.cpp

@@ -43 +43 @@
 {
     JSValueRef exception;
-    if (JSCheckScriptSyntax(m_context, QScriptConverter::toString(program), /* url */ 0, /* starting line */ 1, &exception))
+    JSStringRef source = QScriptConverter::toString(program);
+    bool syntaxIsCorrect = JSCheckScriptSyntax(m_context, source, /* url */ 0, /* starting line */ 1, &exception);
+    JSStringRelease(source);
+    if (syntaxIsCorrect) {
         return new QScriptSyntaxCheckResultPrivate(this);
+    }
     JSValueProtect(m_context, exception);
     return new QScriptSyntaxCheckResultPrivate(this, const_cast<JSObjectRef>(exception));

trunk/JavaScriptCore/qt/api/qscriptsyntaxcheckresult.cpp

@@ -125 +125 @@
 QString QScriptSyntaxCheckResultPrivate::errorMessage() const
 {
-    if (m_exception)
-        return QScriptConverter::toString(JSValueToStringCopy(m_engine->context(), m_exception, /* exception */ 0));
-    return QString();
+    if (!m_exception)
+        return QString();
+
+    JSStringRef tmp = JSValueToStringCopy(m_engine->context(), m_exception, /* exception */ 0);
+    QString message = QScriptConverter::toString(tmp);
+    JSStringRelease(tmp);
+    return message;
 }
 
@@ -135 +139 @@
         return -1;
     // m_exception is an instance of the Exception so it has "line" attribute.
+    JSStringRef lineAttrName = QScriptConverter::toString("line");
     JSValueRef line = JSObjectGetProperty(m_engine->context(),
                                           m_exception,
-                                          QScriptConverter::toString("line"),
+                                          lineAttrName,
                                           /* exceptions */0);
+    JSStringRelease(lineAttrName);
     return JSValueToNumber(m_engine->context(), line, /* exceptions */0);
 }