From 54f4f8526de12dd7a21e0694d9ed1b4e4bbeec62 Mon Sep 17 00:00:00 2001
From: Michael Catanzaro <mcatanzaro@gnome.org>
Date: Feb 27 2015 19:34:49 +0000
Subject: Add patch for rbz#1196847


---

diff --git a/0021-Fix-crash-when-receiving-a-NULL-string-from-DOM-bind.patch b/0021-Fix-crash-when-receiving-a-NULL-string-from-DOM-bind.patch
new file mode 100644
index 0000000..3749fe6
--- /dev/null
+++ b/0021-Fix-crash-when-receiving-a-NULL-string-from-DOM-bind.patch
@@ -0,0 +1,51 @@
+From 017109b4ad6f2cea1990c1be987aff19c475bbe2 Mon Sep 17 00:00:00 2001
+From: Michael Catanzaro <mcatanzaro@igalia.com>
+Date: Fri, 27 Feb 2015 13:07:43 -0600
+Subject: [PATCH] Fix crash when receiving a NULL string from DOM bindings
+
+As of WebKitGTK+ 2.6.5: "Object DOM bindings API now correctly returns
+NULL intead of empty strings to be able to differentiate between not
+present and present but empty."
+
+This was causing crashes on e.g.
+http://www.publico.pt/local/noticia/sindicato-anuncia-adiamento-de-greve-no-metro-de-lisboa-1687386
+
+https://bugzilla.gnome.org/show_bug.cgi?id=745306
+---
+ lib/ephy-web-dom-utils.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/lib/ephy-web-dom-utils.c b/lib/ephy-web-dom-utils.c
+index 72df883..75c586c 100644
+--- a/lib/ephy-web-dom-utils.c
++++ b/lib/ephy-web-dom-utils.c
+@@ -375,7 +375,7 @@ ephy_web_dom_utils_find_form_auth_elements (WebKitDOMHTMLFormElement *form,
+ 
+     g_object_get (element, "type", &element_type, "name", &element_name, NULL);
+ 
+-    if (g_str_equal (element_type, "text") || g_str_equal (element_type, "email")) {
++    if (g_strcmp0 (element_type, "text") == 0 || g_strcmp0 (element_type, "email") == 0) {
+       /* We found more than one inputs of type text; we won't be saving here. */
+       if (username_node) {
+         g_free (element_type);
+@@ -385,7 +385,7 @@ ephy_web_dom_utils_find_form_auth_elements (WebKitDOMHTMLFormElement *form,
+ 
+       username_node = g_object_ref (element);
+       found_auth_elements = TRUE;
+-    } else if (g_str_equal (element_type, "password")) {
++    } else if (g_strcmp0 (element_type, "password") == 0) {
+       /* We found more than one inputs of type password; we won't be saving here. */
+       if (password_node) {
+         g_free (element_type);
+@@ -398,7 +398,7 @@ ephy_web_dom_utils_find_form_auth_elements (WebKitDOMHTMLFormElement *form,
+ 
+       /* We found an input that usually doesn't require a separate login
+        * adminpw is used by mailman admin pages */
+-      if (g_str_equal (element_name, "adminpw"))
++      if (g_strcmp0 (element_name, "adminpw") == 0)
+         found_auth_no_username_elements = TRUE;
+     }
+ 
+-- 
+2.1.0
+
diff --git a/epiphany.spec b/epiphany.spec
index 21c8230..21b6fe0 100644
--- a/epiphany.spec
+++ b/epiphany.spec
@@ -1,7 +1,7 @@
 Name: epiphany
 Epoch: 1
 Version: 3.15.90
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Web browser for GNOME
 
 License: GPLv2+ and CC-BY-SA
@@ -35,6 +35,7 @@ Patch117: 0017-Use-GdTwoLinesRenderer-for-location-entry-completion.patch
 Patch118: 0018-ephy-window-Make-F6-focus-address-entry.patch
 Patch119: 0019-Use-GtkSettings-gtk-xft-dpi-property-to-keep-track-o.patch
 Patch120: 0020-ephy-find-toolbar-Toggle-the-search-bar-with-Ctrl-F.patch
+Patch121: 0021-Fix-crash-when-receiving-a-NULL-string-from-DOM-bind.patch
 
 BuildRequires: desktop-file-utils
 BuildRequires: gcr-devel >= 3.5.5
@@ -106,7 +107,8 @@ installing the epiphany application itself.
 %patch118 -p1
 %patch119 -p1
 %patch120 -p1
-# For 0017-Use-GdTwoLinesRenderer-for-location-entry-completion.patch
+%patch121 -p1
+# For Use-GdTwoLinesRenderer-for-location-entry-completion.patch
 autoreconf -fi
 
 %build
@@ -153,6 +155,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 %{_mandir}/man*/*
 
 %changelog
+* Fri Feb 26 2015 Michael Catanzaro <mcatanzaro@gnome.org> - 1:3.15.90-3
+- Add patch for rbz#1196847
+
 * Thu Feb 26 2015 Michael Catanzaro <mcatanzaro@gnome.org> - 1:3.15.90-2
 - Add several patches that haven't made it upstream yet