diff options
| author | Steve Block <steveblock@google.com> | 2010-02-01 12:36:08 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-02-01 13:02:21 +0000 |
| commit | db217ef7ffee230d812f9da02a02d7d7bc696a8d (patch) | |
| tree | 700a88ae5e3a14ff12d2f53e16f14334eae196b6 /WebCore | |
| parent | 34c1e09895d4c430f5ec596c13099c5a56749f11 (diff) | |
| download | external_webkit-db217ef7ffee230d812f9da02a02d7d7bc696a8d.zip external_webkit-db217ef7ffee230d812f9da02a02d7d7bc696a8d.tar.gz external_webkit-db217ef7ffee230d812f9da02a02d7d7bc696a8d.tar.bz2 | |
Cherry-pick WebKit change 53708 for client-based Geolocation
See http://trac.webkit.org/changeset/53708
This is required to bring Geolocation up-to-date with webkit.org to allow upstreaming of maximumAge code.
Change-Id: I369d96f8af0fc060ca0c8a9c5a16c5cdf91bedd3
Diffstat (limited to 'WebCore')
| -rw-r--r-- | WebCore/ChangeLog | 12 | ||||
| -rw-r--r-- | WebCore/page/Geolocation.cpp | 3 |
2 files changed, 15 insertions, 0 deletions
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog index 99241a4..b9bfc25 100644 --- a/WebCore/ChangeLog +++ b/WebCore/ChangeLog @@ -1,3 +1,15 @@ +2010-01-22 Steve Falkenburg <sfalken@apple.com> + + Reviewed by Dan Bernstein. + + Crash in fast/dom/Window/window-properties if Geolocation enabled + https://bugs.webkit.org/show_bug.cgi?id=34013 + + Add null check to fix Geolocation crash in fast/dom/Window/window-properties. + + * page/Geolocation.cpp: + (WebCore::createGeoposition): + 2010-01-26 Steve Block <steveblock@google.com> Reviewed by Adam Barth. diff --git a/WebCore/page/Geolocation.cpp b/WebCore/page/Geolocation.cpp index bc73bb5..ef3d43c 100644 --- a/WebCore/page/Geolocation.cpp +++ b/WebCore/page/Geolocation.cpp @@ -52,6 +52,9 @@ static const char permissionDeniedErrorMessage[] = "User denied Geolocation"; static PassRefPtr<Geoposition> createGeoposition(GeolocationPosition* position) { + if (!position) + return 0; + RefPtr<Coordinates> coordinates = Coordinates::create(position->latitude(), position->longitude(), position->canProvideAltitude(), position->altitude(), position->accuracy(), position->canProvideAltitudeAccuracy(), position->altitudeAccuracy(), position->canProvideHeading(), position->heading(), position->canProvideSpeed(), position->speed()); |