[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 1c7c28b8e683f2904482bbbf2a52b3b6de2b5c56
Author: Michael Gilbert <michael.s.gilbert at gmail.com>
Date:   Mon Jun 28 21:45:13 2010 -0400

    fix cve-2010-1501

diff --git a/WebCore/loader/DocumentThreadableLoader.cpp b/WebCore/loader/DocumentThreadableLoader.cpp
index de0a0b0..d0f6c04 100644
--- a/WebCore/loader/DocumentThreadableLoader.cpp
+++ b/WebCore/loader/DocumentThreadableLoader.cpp
@@ -287,6 +287,7 @@ void DocumentThreadableLoader::preflightSuccess()
 
 void DocumentThreadableLoader::preflightFailure()
 {
+    m_actualRequest = 0; // Prevent didFinishLoading() from bypassing access check.
     m_client->didFail(ResourceError());
 }
 
diff --git a/debian/changelog b/debian/changelog
index 12ee926..9e3fa61 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,10 +8,12 @@ webkit (1.2.1-3) UNRELEASED; urgency=low
   * Fix cve-2010-1407: iframe information disclosure.
   * Fix cve-2010-1416: svg cross-site information disclosure.
   * Fix cve-2010-1417: possible code execution in the css implementation (this
-    currently duplicated as cve-2010-1665 in the cve tracker).
+    is currently duplicated as cve-2010-1665 in mitre's cve database).
   * Fix cve-2010-1418: remote web script and/or html injection.
   * Fix cve-2010-1421: remote modification of clipboard contents.
   * Fix cve-2010-1422: keyboard focus hijack.
+  * Fix cve-2010-1501: add check to prevent cross-site request forgery (this
+    may be duplicated as cve-2010-1767 in mitre's cve database).
 
  -- Michael Gilbert <michael.s.gilbert at gmail.com>  Thu, 27 May 2010 20:36:41 -0400
 
diff --git a/debian/patches/cve-2010-1501+1767.patch b/debian/patches/cve-2010-1501+1767.patch
new file mode 100644
index 0000000..0866775
--- /dev/null
+++ b/debian/patches/cve-2010-1501+1767.patch
@@ -0,0 +1,15 @@
+description: fix cve-2010-1501 (duplicated as cve-2010-1767 in cve tracker)
+author: Michael Gilbert <michael.s.gilbert at gmail.com>
+origin: http://trac.webkit.org/changeset/57041
+Index: webkit-1.2.1/WebCore/loader/DocumentThreadableLoader.cpp
+===================================================================
+--- webkit-1.2.1.orig/WebCore/loader/DocumentThreadableLoader.cpp	2010-05-13 16:31:30.000000000 -0400
++++ webkit-1.2.1/WebCore/loader/DocumentThreadableLoader.cpp	2010-06-28 21:40:03.000000000 -0400
+@@ -287,6 +287,7 @@
+ 
+ void DocumentThreadableLoader::preflightFailure()
+ {
++    m_actualRequest = 0; // Prevent didFinishLoading() from bypassing access check.
+     m_client->didFail(ResourceError());
+ }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index a8257ea..325c2ed 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,3 +14,4 @@ cve-2010-1418-part2.patch
 cve-2010-1418-part3.patch
 cve-2010-1422.patch
 cve-2010-1421.patch
+cve-2010-1501+1767.patch

-- 
WebKit Debian packaging