-
-
Notifications
You must be signed in to change notification settings - Fork 8
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
Fix NullReferenceException when the native enumerator returns null #620
Merged
Merged
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
071fb8c
Implement HResult.ToString
GeertvanHorrik 93041a3
Add Moq to test project
GeertvanHorrik acbcc3c
Fix NullReferenceException when enumerating WMI
GeertvanHorrik 424c496
Decorate win32 interfaces with nullable annotations
GeertvanHorrik d12f34d
Approve public api
GeertvanHorrik File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
40 changes: 40 additions & 0 deletions
40
src/Orc.SystemInfo.Tests/Wmi/WindowsManagementObjectEnumeratorFacts.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,40 @@ | ||
namespace Orc.SystemInfo.Tests | ||
{ | ||
using System; | ||
using System.Collections.Generic; | ||
using System.Linq; | ||
using System.Text; | ||
using System.Threading; | ||
using System.Threading.Tasks; | ||
using Moq; | ||
using NUnit.Framework; | ||
using Orc.SystemInfo.Win32; | ||
using Orc.SystemInfo.Wmi; | ||
|
||
public class WindowsManagementObjectEnumeratorFacts | ||
{ | ||
[Test] | ||
public async Task Returns_False_When_Enumerator_Returns_Null_Async() | ||
{ | ||
IWbemClassObject objects; | ||
uint returnedCount; | ||
|
||
var wbemClassObjectEnumeratorMock = new Mock<IWbemClassObjectEnumerator>(); | ||
|
||
wbemClassObjectEnumeratorMock.Setup(x => x.Next(It.IsAny<int>(), It.IsAny<uint>(), out objects, out returnedCount)) | ||
.Returns((int to, uint c, out IWbemClassObject o, out uint rc) => | ||
{ | ||
o = null; | ||
rc = 0; | ||
|
||
return new HResult(0); | ||
}); | ||
|
||
using var enumerator = new WindowsManagementObjectEnumerator(wbemClassObjectEnumeratorMock.Object); | ||
|
||
var moveNextResult = enumerator.MoveNext(); | ||
|
||
Assert.That(moveNextResult, Is.False); | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
3 changes: 1 addition & 2 deletions
3
src/Orc.SystemInfo/Win32/Wbem/Extensions/IWbemClassObjectEnumeratorExtensions.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
IWbemClassObjectEnumerator i think it should have nullable notation for parameter: out IWbemClassObject? objects,