Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport an upstream fix for geolocation crash. (uplift to 1.71.x) #26255

Merged
merged 1 commit into from
Oct 29, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
diff --git a/third_party/blink/renderer/modules/geolocation/geolocation.cc b/third_party/blink/renderer/modules/geolocation/geolocation.cc
index 223049e27395830a64f80ac67ccf435793e3f1e3..c7d247a700167f8215648bcb4fd43836f8507b40 100644
--- a/third_party/blink/renderer/modules/geolocation/geolocation.cc
+++ b/third_party/blink/renderer/modules/geolocation/geolocation.cc
@@ -90,10 +90,12 @@ GeolocationPositionError* CreatePositionError(
error_code = GeolocationPositionError::kPositionUnavailable;
break;
default:
- // On Blink side, it should only handles W3C defined error codes.
- // If it reaches here that means an unexpected error type being propagated
- // to Blink. This should never happen.
- NOTREACHED_NORETURN();
+ // On the Blink side, it should only handle W3C-defined error codes. If it
+ // reaches here, that means a platform-specific error type is being
+ // propagated to Blink. We will now just use kPositionUnavailable until
+ // more explicit error codes are defined in the W3C spec.
+ error_code = GeolocationPositionError::kPositionUnavailable;
+ break;
}
return MakeGarbageCollected<GeolocationPositionError>(error_code,
error.error_message);
Loading