Fix a bug and improve upon Brady's fix

        Reviewed by Anders.

        * bindings/js/JSSQLTransactionCustom.cpp:
        (WebCore::JSSQLTransaction::executeSql): Made the code a little
        clearer and more correct.
        * loader/icon/IconDatabase.cpp: Put parentheses around the expansion
        of IS_ICON_SYNC_THREAD() so that ASSERT_NOT_SYNC_THREAD() does the
        comparison it meant to.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@27774 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index dff9081dd13a638e4739018bad6b35afab364f85..61eaa4322be84954cfb3b5ee884de5787b130c7f 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2007-11-13  Adam Roben  <aroben@apple.com>
+
+        Fix a bug and improve upon Brady's fix
+
+        Reviewed by Anders.
+
+        * bindings/js/JSSQLTransactionCustom.cpp:
+        (WebCore::JSSQLTransaction::executeSql): Made the code a little
+        clearer and more correct.
+        * loader/icon/IconDatabase.cpp: Put parentheses around the expansion
+        of IS_ICON_SYNC_THREAD() so that ASSERT_NOT_SYNC_THREAD() does the
+        comparison it meant to.
+
 2007-11-13  Sam Weinig  <sam@webkit.org>
 
         Fix Qt and Gtk builds.

diff --git a/WebCore/bindings/js/JSSQLTransactionCustom.cpp b/WebCore/bindings/js/JSSQLTransactionCustom.cpp
index 5414adbd4e76bc90ead6e63d5a085f7b66938e01..4573557368483b5d198aea2a3d754dfe56ddd405 100644 (file)
--- a/WebCore/bindings/js/JSSQLTransactionCustom.cpp
+++ b/WebCore/bindings/js/JSSQLTransactionCustom.cpp
@@ -71,9 +71,9 @@ JSValue* JSSQLTransaction::executeSql(ExecState* exec, const List& args)
     }
 
     RefPtr<SQLStatementCallback> callback;
-    if (args.size() > 2) {
-        JSObject* object = 0;
-        if (!args[2]->isNull() && !(object = args[2]->getObject())) {
+    if (args.size() > 2 && !args[2]->isNull()) {
+        JSObject* object = args[2]->getObject();
+        if (!object) {
             setDOMException(exec, TYPE_MISMATCH_ERR);
             return jsUndefined();
         }
@@ -83,9 +83,9 @@ JSValue* JSSQLTransaction::executeSql(ExecState* exec, const List& args)
     }
     
     RefPtr<SQLStatementErrorCallback> errorCallback;
-    if (args.size() > 3) {
-        JSObject* object = 0;
-        if (!args[3]->isNull() && !(object = args[3]->getObject())) {
+    if (args.size() > 3 && !args[3]->isNull()) {
+        JSObject* object = args[3]->getObject();
+        if (!object) {
             setDOMException(exec, TYPE_MISMATCH_ERR);
             return jsUndefined();
         }

diff --git a/WebCore/loader/icon/IconDatabase.cpp b/WebCore/loader/icon/IconDatabase.cpp
index bf6df5a20d8762bd46d24498f859770116d7409d..cdbc5be99dc5ee27360b9c0f6c6fd67230287e94 100644 (file)
--- a/WebCore/loader/icon/IconDatabase.cpp
+++ b/WebCore/loader/icon/IconDatabase.cpp
@@ -60,7 +60,7 @@
 #define ASSERT_NOT_SYNC_THREAD() ASSERT(!m_syncThreadRunning || !IS_ICON_SYNC_THREAD())
 
 // For methods that are meant to support the sync thread ONLY
-#define IS_ICON_SYNC_THREAD() m_syncThread == currentThread()
+#define IS_ICON_SYNC_THREAD() (m_syncThread == currentThread())
 #define ASSERT_ICON_SYNC_THREAD() ASSERT(IS_ICON_SYNC_THREAD())
 
 namespace WebCore {