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.

Sign up for GitHub

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

Jump to bottom

[System] Guard against attempting to creating out-of-range spans in m… #16049

Merged
merged 1 commit into from
Aug 8, 2019
Merged

[System] Guard against attempting to creating out-of-range spans in m… #16049

merged 1 commit into from
Aug 8, 2019

Conversation

alexischr
Copy link
Contributor

@alexischr alexischr commented Aug 6, 2019 •
edited
Loading

…acOS FileSystemWatcher

Should fix #15575

@alexischr alexischr force-pushed the fix-gh-15575 branch 3 times, most recently from 9fb3c0f to 195860c Compare August 6, 2019 10:24
@marek-safar
Copy link
Member

Should we upstream the fix?

@steveisok
Copy link
Contributor

@marek-safar Since this is intended to fix a crash in VSM, can we move this through and consider upstreaming separate?

@steveisok
Copy link
Contributor

@monojenkins build failed

@marek-safar
Copy link
Member

Yes but I am not sure it's the right fix if CoreFX is not experiencing the same crash

@alexischr
Copy link
Contributor Author

@marek-safar @steveisok I brought this to upstream attention here: https://github.com/dotnet/corefx/issues/40054 - they don't have an issue reported of this same problem. There is no opinion so far.

I should add a check that these event paths start with _fullDirectory (not just that the lengths are okay), but it would be nice to get a nod that this is an expected problem since I have not been able to reproduce the issue yet.

@steveisok
Copy link
Contributor

Is CoreFX actively testing against Catalina? All but a few cases of the crash are happening there.

@alexischr alexischr force-pushed the fix-gh-15575 branch 4 times, most recently from d746087 to b4a8d23 Compare August 8, 2019 16:45
@alexischr
Copy link
Contributor Author

@monojenkins build failed

steveisok
steveisok approved these changes Aug 8, 2019
View reviewed changes
Copy link
Contributor

@steveisok steveisok left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. All that needs done is to resolve the corefx conflict.

@steveisok
Copy link
Contributor

@monojenkins backport 2019-06

@steveisok
Copy link
Contributor

@monojenkins backport 2019-08

@monojenkins
Copy link
Contributor

@steveisok backporting to 2019-06 failed, the patch results in conflicts:

Applying: [System] Guard against attempting to creating out-of-range spans in macOS FileSystemWatcher
Using index info to reconstruct a base tree...
M	external/corefx
Falling back to patching base and 3-way merge...
warning: Failed to merge submodule external/corefx (not checked out)
Auto-merging external/corefx
CONFLICT (submodule): Merge conflict in external/corefx
error: Failed to merge in the changes.
Patch failed at 0001 [System] Guard against attempting to creating out-of-range spans in macOS FileSystemWatcher

Please backport manually!

@monojenkins
Copy link
Contributor

@steveisok backporting to 2019-08 failed, the patch results in conflicts:

Applying: [System] Guard against attempting to creating out-of-range spans in macOS FileSystemWatcher
Using index info to reconstruct a base tree...
M	external/corefx
Falling back to patching base and 3-way merge...
warning: Failed to merge submodule external/corefx (not checked out)
Auto-merging external/corefx
CONFLICT (submodule): Merge conflict in external/corefx
error: Failed to merge in the changes.
Patch failed at 0001 [System] Guard against attempting to creating out-of-range spans in macOS FileSystemWatcher

Please backport manually!

@alexischr alexischr changed the title [corlib] Guard against attempting to creating out-of-range spans in m… [System] Guard against attempting to creating out-of-range spans in m… Aug 8, 2019
@alexischr
Copy link
Contributor Author

Failures in System.ComponentModel.Composition.Tests are unrelated

@alexischr alexischr merged commit 1127974 into master Aug 8, 2019
@alexischr alexischr mentioned this pull request Aug 8, 2019
Merged
akoeplinger pushed a commit that referenced this pull request Aug 8, 2019
@alexischr @akoeplinger
[2019-08] [System] Guard against attempting to creating out-of-range …
a965866 
…spans in m… (#16124)

* [System] Guard against attempting to creating out-of-range spans in macOS FileSystemWatcher

Backport of #16049
@akoeplinger akoeplinger deleted the fix-gh-15575 branch August 8, 2019 22:35
@alexischr alexischr mentioned this pull request Aug 8, 2019
Merged
akoeplinger pushed a commit that referenced this pull request Aug 8, 2019
@alexischr @akoeplinger
[2019-06] [System] Guard against attempting to creating out-of-range …
893099f 
…spans in m… (#16123)

* [System] Guard against attempting to creating out-of-range spans in macOS FileSystemWatcher

Backport of #16049
steveisok pushed a commit to steveisok/mono that referenced this pull request Aug 9, 2019
[2019-02] [System] Guard against attempting to creating out-of-range …
86acf49 
…spans in macOS FileSystemWatcher

Bump to mono/corefx@545a4a5

Backport of mono#16049
@steveisok steveisok mentioned this pull request Aug 9, 2019
Merged
alexischr pushed a commit that referenced this pull request Aug 9, 2019
@alexischr
[2019-02] [System] Guard against attempting to creating out-of-range …
7912059 
…spans in macOS FileSystemWatcher

Bump to mono/corefx@545a4a5

Backport of #16049
alexischr added a commit to mono/corefx that referenced this pull request Aug 9, 2019
@alexischr
Fix use of Span.Slice(int start() introduced in mono/mono#16049
48f42bc
alexischr added a commit that referenced this pull request Aug 9, 2019
@alexischr
Fix use of Span.Slice(int start() introduced in #16049
486aecb
alexischr added a commit to mono/corefx that referenced this pull request Aug 9, 2019
@alexischr
Fix use of Span.Slice(int start() introduced in mono/mono#16049
fd0b584
alexischr added a commit that referenced this pull request Aug 9, 2019
@alexischr
Fix use of Span.Slice(int start() introduced in #16049
e34c385
monojenkins pushed a commit to monojenkins/corefx that referenced this pull request Aug 9, 2019
@alexischr @monojenkins
Fix use of Span.Slice(int start() introduced in mono/mono#16049
99eccf3
monojenkins pushed a commit to monojenkins/corefx that referenced this pull request Aug 9, 2019
@alexischr @monojenkins
Fix use of Span.Slice(int start() introduced in mono/mono#16049
c5051de
akoeplinger pushed a commit to mono/corefx that referenced this pull request Aug 9, 2019
@alexischr @akoeplinger
Fix use of Span.Slice(int start() introduced in mono/mono#16049 (#323)
9ba63a0
akoeplinger pushed a commit to mono/corefx that referenced this pull request Aug 9, 2019
@alexischr @akoeplinger
Fix use of Span.Slice(int start() introduced in mono/mono#16049 (#324)
8ae70a9
akoeplinger pushed a commit to mono/corefx that referenced this pull request Aug 9, 2019
@monojenkins @akoeplinger
Fix use of Span.Slice(int start() introduced in mono/mono#16049 (#326)
c7dd314
akoeplinger pushed a commit to mono/corefx that referenced this pull request Aug 9, 2019
@monojenkins @akoeplinger
Fix use of Span.Slice(int start() introduced in mono/mono#16049 (#325)
83f8042
alexischr added a commit to mono/corefx that referenced this pull request Aug 9, 2019
@alexischr
Fix another bug in mono/mono#16049
0100d4e
steveisok pushed a commit to mono/corefx that referenced this pull request Aug 9, 2019
@alexischr @steveisok
Fix another bug in mono/mono#16049 (#327)
c976905
monojenkins pushed a commit to monojenkins/corefx that referenced this pull request Aug 10, 2019
@alexischr @monojenkins
Fix another bug in mono/mono#16049
89d39fb
monojenkins pushed a commit to monojenkins/corefx that referenced this pull request Aug 10, 2019
@alexischr @monojenkins
Fix another bug in mono/mono#16049
b0fd480
monojenkins pushed a commit to monojenkins/corefx that referenced this pull request Aug 10, 2019
@alexischr @monojenkins
Fix another bug in mono/mono#16049
34434e0
akoeplinger pushed a commit to mono/corefx that referenced this pull request Aug 10, 2019
@monojenkins @akoeplinger
Fix another bug in mono/mono#16049 (#330)
850cc3a
akoeplinger pushed a commit to mono/corefx that referenced this pull request Aug 10, 2019
@monojenkins @akoeplinger
Fix another bug in mono/mono#16049 (#329)
7414448
akoeplinger pushed a commit to mono/corefx that referenced this pull request Aug 10, 2019
@monojenkins @akoeplinger
Fix another bug in mono/mono#16049 (#328)
b2127b5
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@steveisok steveisok steveisok approved these changes

@akoeplinger akoeplinger Awaiting requested review from akoeplinger

@EgorBo EgorBo Awaiting requested review from EgorBo

@marek-safar marek-safar Awaiting requested review from marek-safar

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Crash in FileSystemWatcher processing code
4 participants
@alexischr @marek-safar @steveisok @monojenkins