Skip to content

Merge Release 4.10.1 into Master #895

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

Closed
wants to merge 3 commits into from
Closed

Merge Release 4.10.1 into Master #895

wants to merge 3 commits into from

Conversation

zxu123
Copy link
Contributor

@zxu123 zxu123 commented Mar 8, 2018

No description provided.

paulb777 and others added 3 commits March 8, 2018 11:06
Fixes b/74357976 which caused unauthenticated users to be unable to reach the Firestore backend and updates the changelog.
This fixes a known instances of memory corruption where in
FSTLevelDBMutationQueue, the NSString view was retained for later, and
the incorrect user was used, causing b/74381054.

gRPC does not necessarily copy its string argumnets and if our hostname
were configured to a non-default one it's possible that we could corrupt
the host cache too.

All remaining usages of util::WrapNSStringNoCopy are obviously safe:
passed into logging or other known transient usages.
@googlebot
Copy link

So there's good news and bad news.

👍 The good news is that everyone that needs to sign a CLA (the pull request submitter and all commit authors) have done so. Everything is all good there.

😕 The bad news is that it appears that one or more commits were authored by someone other than the pull request submitter. We need to confirm that all authors are ok with their commits being contributed to this project. Please have them confirm that here in the pull request.

Note to project maintainer: This is a terminal state, meaning the cla/google commit status will not change from this state. It's up to you to confirm consent of the commit author(s) and merge this pull request when appropriate.

@zxu123 zxu123 requested review from wilhuff and mikelehen March 8, 2018 21:33
@mikelehen
Copy link
Contributor

Can you resolve the conflicts?

@zxu123 zxu123 closed this Mar 8, 2018
@zxu123
Copy link
Contributor Author

zxu123 commented Mar 8, 2018

Sorry, didn't notice there is conflict. The conflict is fixed in release-4.10.1-dup and will be merged to master at #896. Closing this one since both release-4.10.1 and master is readonly.

@firebase firebase locked and limited conversation to collaborators Nov 6, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants