Attachment 340209 Details for Bug 185556 – Patch

[patch] Patch

bug-185556-20180511134802.patch (text/plain), 9.02 KB, created by Michael Catanzaro on 2018-05-11 11:48:03 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Michael Catanzaro

Created: 2018-05-11 11:48:03 PDT

Size: 9.02 KB

patch

obsolete

>Subversion Revision: 231704
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index bb3e5a42c7b9deb1f1f0070d6554b126ff494603..427e318aa428e3e266700bacdf7bb2a6e846ce75 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,21 @@
>+2018-05-11  Michael Catanzaro  <mcatanzaro@igalia.com>
>+
>+        [GTK] Silence GCC 8 warnings
>+        https://bugs.webkit.org/show_bug.cgi?id=185556
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Silence remaining -Wcast-function-type warnings by casting through void (*)(void), aka
>+        GCallback.
>+
>+        * accessibility/atk/WebKitAccessibleHyperlink.cpp:
>+        (webkitAccessibleHyperlinkSetProperty):
>+        (webkitAccessibleHyperlinkGetType):
>+        * accessibility/atk/WebKitAccessibleWrapperAtk.cpp:
>+        (webkitAccessibleGetType):
>+        * platform/network/soup/NetworkStorageSessionSoup.cpp:
>+        (WebCore::NetworkStorageSession::getCredentialFromPersistentStorage):
>+
> 2018-05-11  Brady Eidson  <beidson@apple.com>
> 
>         Make sure history navigations reuse the existing process when necessary.
>diff --git a/Source/WebCore/accessibility/atk/WebKitAccessibleHyperlink.cpp b/Source/WebCore/accessibility/atk/WebKitAccessibleHyperlink.cpp
>index 6a83e81e5d4fc44adf493a67af5ff3e88dad8732..a6e963deabf7d01f507893b02623234f608da607 100644
>--- a/Source/WebCore/accessibility/atk/WebKitAccessibleHyperlink.cpp
>+++ b/Source/WebCore/accessibility/atk/WebKitAccessibleHyperlink.cpp
>@@ -342,7 +342,7 @@ static void webkitAccessibleHyperlinkSetProperty(GObject* object, guint propId,
>         // No need to check and unref previous values of
>         // priv->hyperlinkImpl as this is a CONSTRUCT ONLY property
>         priv->hyperlinkImpl = WEBKIT_ACCESSIBLE(g_value_get_object(value));
>-        g_object_weak_ref(G_OBJECT(priv->hyperlinkImpl), (GWeakNotify)g_object_unref, object);
>+        g_object_weak_ref(G_OBJECT(priv->hyperlinkImpl), (GWeakNotify)(GCallback)g_object_unref, object);
>         break;
>     default:
>         G_OBJECT_WARN_INVALID_PROPERTY_ID(object, propId, pspec);
>@@ -397,17 +397,17 @@ GType webkitAccessibleHyperlinkGetType()
>             sizeof(WebKitAccessibleHyperlinkClass),
>             (GBaseInitFunc) 0,
>             (GBaseFinalizeFunc) 0,
>-            (GClassInitFunc) webkitAccessibleHyperlinkClassInit,
>+            (GClassInitFunc)(GCallback) webkitAccessibleHyperlinkClassInit,
>             (GClassFinalizeFunc) 0,
>             0, /* class data */
>             sizeof(WebKitAccessibleHyperlink), /* instance size */
>             0, /* nb preallocs */
>-            (GInstanceInitFunc) webkitAccessibleHyperlinkInit,
>+            (GInstanceInitFunc)(GCallback) webkitAccessibleHyperlinkInit,
>             0 /* value table */
>         };
> 
>         static const GInterfaceInfo actionInfo = {
>-            (GInterfaceInitFunc)(GInterfaceInitFunc)atkActionInterfaceInit,
>+            (GInterfaceInitFunc)(GCallback)atkActionInterfaceInit,
>             (GInterfaceFinalizeFunc) 0, 0
>         };
> 
>diff --git a/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp b/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp
>index 63a261b56de7da20a4843459673cdfba4247715b..4da6f76b6b70655f80b9c3cc9b7b962c5fba34e7 100644
>--- a/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp
>+++ b/Source/WebCore/accessibility/atk/WebKitAccessibleWrapperAtk.cpp
>@@ -1177,7 +1177,7 @@ webkitAccessibleGetType(void)
>             sizeof(WebKitAccessibleClass),
>             (GBaseInitFunc) 0,
>             (GBaseFinalizeFunc) 0,
>-            (GClassInitFunc) webkitAccessibleClassInit,
>+            (GClassInitFunc)(GCallback) webkitAccessibleClassInit,
>             (GClassFinalizeFunc) 0,
>             0, /* class data */
>             sizeof(WebKitAccessible), /* instance size */
>@@ -1194,20 +1194,20 @@ webkitAccessibleGetType(void)
> }
> 
> static const GInterfaceInfo AtkInterfacesInitFunctions[] = {
>-    {reinterpret_cast<GInterfaceInitFunc>(webkitAccessibleActionInterfaceInit), 0, 0},
>-    {reinterpret_cast<GInterfaceInitFunc>(webkitAccessibleSelectionInterfaceInit), 0, 0},
>-    {reinterpret_cast<GInterfaceInitFunc>(webkitAccessibleEditableTextInterfaceInit), 0, 0},
>-    {reinterpret_cast<GInterfaceInitFunc>(webkitAccessibleTextInterfaceInit), 0, 0},
>-    {reinterpret_cast<GInterfaceInitFunc>(webkitAccessibleComponentInterfaceInit), 0, 0},
>-    {reinterpret_cast<GInterfaceInitFunc>(webkitAccessibleImageInterfaceInit), 0, 0},
>-    {reinterpret_cast<GInterfaceInitFunc>(webkitAccessibleTableInterfaceInit), 0, 0},
>+    {reinterpret_cast<GInterfaceInitFunc>(reinterpret_cast<GCallback>(webkitAccessibleActionInterfaceInit)), 0, 0},
>+    {reinterpret_cast<GInterfaceInitFunc>(reinterpret_cast<GCallback>(webkitAccessibleSelectionInterfaceInit)), 0, 0},
>+    {reinterpret_cast<GInterfaceInitFunc>(reinterpret_cast<GCallback>(webkitAccessibleEditableTextInterfaceInit)), 0, 0},
>+    {reinterpret_cast<GInterfaceInitFunc>(reinterpret_cast<GCallback>(webkitAccessibleTextInterfaceInit)), 0, 0},
>+    {reinterpret_cast<GInterfaceInitFunc>(reinterpret_cast<GCallback>(webkitAccessibleComponentInterfaceInit)), 0, 0},
>+    {reinterpret_cast<GInterfaceInitFunc>(reinterpret_cast<GCallback>(webkitAccessibleImageInterfaceInit)), 0, 0},
>+    {reinterpret_cast<GInterfaceInitFunc>(reinterpret_cast<GCallback>(webkitAccessibleTableInterfaceInit)), 0, 0},
> #if ATK_CHECK_VERSION(2,11,90)
>-    {reinterpret_cast<GInterfaceInitFunc>(webkitAccessibleTableCellInterfaceInit), 0, 0},
>+    {reinterpret_cast<GInterfaceInitFunc>(reinterpret_cast<GCallback>(webkitAccessibleTableCellInterfaceInit)), 0, 0},
> #endif
>-    {reinterpret_cast<GInterfaceInitFunc>(webkitAccessibleHypertextInterfaceInit), 0, 0},
>-    {reinterpret_cast<GInterfaceInitFunc>(webkitAccessibleHyperlinkImplInterfaceInit), 0, 0},
>-    {reinterpret_cast<GInterfaceInitFunc>(webkitAccessibleDocumentInterfaceInit), 0, 0},
>-    {reinterpret_cast<GInterfaceInitFunc>(webkitAccessibleValueInterfaceInit), 0, 0}
>+    {reinterpret_cast<GInterfaceInitFunc>(reinterpret_cast<GCallback>(webkitAccessibleHypertextInterfaceInit)), 0, 0},
>+    {reinterpret_cast<GInterfaceInitFunc>(reinterpret_cast<GCallback>(webkitAccessibleHyperlinkImplInterfaceInit)), 0, 0},
>+    {reinterpret_cast<GInterfaceInitFunc>(reinterpret_cast<GCallback>(webkitAccessibleDocumentInterfaceInit)), 0, 0},
>+    {reinterpret_cast<GInterfaceInitFunc>(reinterpret_cast<GCallback>(webkitAccessibleValueInterfaceInit)), 0, 0}
> };
> 
> enum WAIType {
>diff --git a/Source/WebCore/platform/network/soup/NetworkStorageSessionSoup.cpp b/Source/WebCore/platform/network/soup/NetworkStorageSessionSoup.cpp
>index 411b9cd4a6b2c202703c368052945ffd62da8093..bf3b23d6ad48e5f0ae401392df8a487e07747d7b 100644
>--- a/Source/WebCore/platform/network/soup/NetworkStorageSessionSoup.cpp
>+++ b/Source/WebCore/platform/network/soup/NetworkStorageSessionSoup.cpp
>@@ -237,7 +237,7 @@ void NetworkStorageSession::getCredentialFromPersistentStorage(const ProtectionS
>             }
> 
>             GRefPtr<SecretItem> secretItem = static_cast<SecretItem*>(elements->data);
>-            g_list_foreach(elements.get(), reinterpret_cast<GFunc>(g_object_unref), nullptr);
>+            g_list_foreach(elements.get(), reinterpret_cast<GFunc>(reinterpret_cast<GCallback>(g_object_unref)), nullptr);
>             GRefPtr<GHashTable> attributes = adoptGRef(secret_item_get_attributes(secretItem.get()));
>             String user = String::fromUTF8(static_cast<const char*>(g_hash_table_lookup(attributes.get(), "user")));
>             if (user.isEmpty()) {
>diff --git a/Tools/ChangeLog b/Tools/ChangeLog
>index c2ddfb514f161776d0cfb8e7f9bf59e9df7aa0b0..f5265a4f2ca65a09d96e95e19481bf4cc94d382b 100644
>--- a/Tools/ChangeLog
>+++ b/Tools/ChangeLog
>@@ -1,3 +1,16 @@
>+2018-05-11  Michael Catanzaro  <mcatanzaro@igalia.com>
>+
>+        [GTK] Silence GCC 8 warnings
>+        https://bugs.webkit.org/show_bug.cgi?id=185556
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        GCC is complaining about this strncpy. It's guaranteed to be safe, because the length of
>+        source and destination are always identical. But switching to snprintf avoids the warning.
>+
>+        * DumpRenderTree/TestNetscapePlugIn/Tests/FormValue.cpp:
>+        (FormValue::NPP_GetValue):
>+
> 2018-05-11  Brady Eidson  <beidson@apple.com>
> 
>         Make sure history navigations reuse the existing process when necessary.
>diff --git a/Tools/DumpRenderTree/TestNetscapePlugIn/Tests/FormValue.cpp b/Tools/DumpRenderTree/TestNetscapePlugIn/Tests/FormValue.cpp
>index 738e192ebfdd54bdbad999a400829b3fadd6192a..c48e5f63583f9b67bbe185f114e9eeb2285af2a9 100644
>--- a/Tools/DumpRenderTree/TestNetscapePlugIn/Tests/FormValue.cpp
>+++ b/Tools/DumpRenderTree/TestNetscapePlugIn/Tests/FormValue.cpp
>@@ -44,7 +44,7 @@ NPError FormValue::NPP_GetValue(NPPVariable variable, void *value)
>         *((void**)value) = browser->memalloc(sizeof(formValueText));
>         if (!*((void**)value))
>             return NPERR_OUT_OF_MEMORY_ERROR;
>-        strncpy(*((char**)value), formValueText, sizeof(formValueText));
>+        snprintf(*((char**)value), sizeof(formValueText), "%s", formValueText);
>         return NPERR_NO_ERROR;
>     }
>     return NPERR_GENERIC_ERROR;

Flags:

zan: review+

Actions: View | Formatted Diff | Diff

Attachments on bug 185556: 340209