Skip to content

Fix Repl window null deref when main NTVS package has not been loaded yet #918

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

Merged
merged 2 commits into from
May 4, 2016
Merged

Fix Repl window null deref when main NTVS package has not been loaded yet #918

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
50b2973
Fix Repl window null deref when main NTVS package has not been loaded…
mjbvz May 3, 2016
894ce53
Add debug asserts
mjbvz May 4, 2016
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
9 changes: 9 additions & 0 deletions Common/Product/SharedProject/CommonPackage.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,11 @@ internal void RegisterCommands(IEnumerable<Command> commands, Guid cmdSet) {
/// </summary>
/// <returns></returns>
public static IWpfTextView GetActiveTextView(System.IServiceProvider serviceProvider) {
if (serviceProvider == null) {
Debug.Assert(false, "No service provider");
return null;
}
Copy link
Contributor

@mousetraps mousetraps May 4, 2016

Choose a reason for hiding this comment

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

for both null checks, it's okay to fail gracefully, but let's go ahead and also add a debug assert so we know something's up when the issue occurs.


var monitorSelection = (IVsMonitorSelection)serviceProvider.GetService(typeof(SVsShellMonitorSelection));
if (monitorSelection == null) {
return null;
Expand Down Expand Up @@ -174,6 +179,10 @@ public static IComponentModel ComponentModel {
}

internal static CommonProjectNode GetStartupProject(System.IServiceProvider serviceProvider) {
if (serviceProvider == null) {
Debug.Assert(false, "No service provider");
return null;
}
var buildMgr = (IVsSolutionBuildManager)serviceProvider.GetService(typeof(IVsSolutionBuildManager));
IVsHierarchy hierarchy;
if (buildMgr != null && ErrorHandler.Succeeded(buildMgr.get_StartupProject(out hierarchy)) && hierarchy != null) {
Expand Down