diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2010-09-29 12:56:10 +0000 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2010-09-29 12:56:10 +0000 |
| commit | 47e4450944184f87f5eea01f767b249620ff2210 (patch) | |
| tree | c15edd175927ba0ede24735ee58686de1f47645c /main/webkit/cve-2010-3120.patch | |
| parent | fcc956ac58ab08d5edab02c07afce2fae8f34697 (diff) | |
| download | aports-47e4450944184f87f5eea01f767b249620ff2210.tar.bz2 aports-47e4450944184f87f5eea01f767b249620ff2210.tar.xz | |
main/webkit: add 7 of cve patches
Diffstat (limited to 'main/webkit/cve-2010-3120.patch')
| -rw-r--r-- | main/webkit/cve-2010-3120.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/main/webkit/cve-2010-3120.patch b/main/webkit/cve-2010-3120.patch new file mode 100644 index 0000000000..976affc370 --- /dev/null +++ b/main/webkit/cve-2010-3120.patch @@ -0,0 +1,27 @@ +description: fix cve-2010-3120 +author: Michael Gilbert <michael.s.gilbert@gmail.com> +origin: http://trac.webkit.org/changeset/65329 +Index: webkit-1.2.4/WebCore/page/Geolocation.cpp +=================================================================== +--- webkit-1.2.4.orig/WebCore/page/Geolocation.cpp 2010-09-03 15:18:06.000000000 -0400 ++++ webkit-1.2.4/WebCore/page/Geolocation.cpp 2010-09-06 22:14:03.000000000 -0400 +@@ -252,6 +252,9 @@ + + void Geolocation::getCurrentPosition(PassRefPtr<PositionCallback> successCallback, PassRefPtr<PositionErrorCallback> errorCallback, PassRefPtr<PositionOptions> options) + { ++ if (!m_frame) ++ return; ++ + RefPtr<GeoNotifier> notifier = startRequest(successCallback, errorCallback, options); + ASSERT(notifier); + +@@ -260,6 +263,9 @@ + + int Geolocation::watchPosition(PassRefPtr<PositionCallback> successCallback, PassRefPtr<PositionErrorCallback> errorCallback, PassRefPtr<PositionOptions> options) + { ++ if (!m_frame) ++ return 0; ++ + RefPtr<GeoNotifier> notifier = startRequest(successCallback, errorCallback, options); + ASSERT(notifier); + |