[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.2.1-2-29-g5dbcb1c

[Michael Gilbert]

The following commit has been merged in the debian/unstable branch:
commit 16e6e67fd7bdbfa55141646b6ae45d41bc69d3ab
Author: Michael Gilbert <michael.s.gilbert at gmail.com>
Date:   Mon Jun 28 22:14:03 2010 -0400

    fix cve-2010-1772

diff --git a/WebCore/page/Geolocation.cpp b/WebCore/page/Geolocation.cpp
index d0b0b79..9acbc7f 100644
--- a/WebCore/page/Geolocation.cpp
+++ b/WebCore/page/Geolocation.cpp
@@ -219,6 +219,7 @@ Geolocation::~Geolocation()
 
 void Geolocation::disconnectFrame()
 {
+    stopTimers();
     stopUpdating();
     if (m_frame) {
         if (m_frame->document())
diff --git a/debian/changelog b/debian/changelog
index c44b41f..036196a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,6 +25,7 @@ webkit (1.2.1-3) UNRELEASED; urgency=low
   * Fix cve-2010-1770: possible code execution due to improper handling of the
     ibm1147 character set.
   * Fix cve-2010-1771: possible code execution due to improper font handling.
+  * Fix cve-2010-1772: geolocation disconnectframe timer issue.
     element.
 
  -- Michael Gilbert <michael.s.gilbert at gmail.com>  Thu, 27 May 2010 20:36:41 -0400
diff --git a/debian/patches/cve-2010-1772.patch b/debian/patches/cve-2010-1772.patch
new file mode 100644
index 0000000..7935e4a
--- /dev/null
+++ b/debian/patches/cve-2010-1772.patch
@@ -0,0 +1,15 @@
+description: fix cve-2010-1772
+author: Michael Gilbert <michael.s.gilbert at gmail.com>
+origin: http://trac.webkit.org/changeset/59859
+Index: webkit-1.2.1/WebCore/page/Geolocation.cpp
+===================================================================
+--- webkit-1.2.1.orig/WebCore/page/Geolocation.cpp	2010-06-28 17:11:40.000000000 -0400
++++ webkit-1.2.1/WebCore/page/Geolocation.cpp	2010-06-28 22:11:46.000000000 -0400
+@@ -219,6 +219,7 @@
+ 
+ void Geolocation::disconnectFrame()
+ {
++    stopTimers();
+     stopUpdating();
+     if (m_frame) {
+         if (m_frame->document())
diff --git a/debian/patches/series b/debian/patches/series
index 9fb02ad..c6d3dc4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -23,3 +23,4 @@ cve-2010-1761.patch
 cve-2010-1762.patch
 cve-2010-1770.patch
 cve-2010-1771.patch
+cve-2010-1772.patch

-- 
WebKit Debian packaging