More nullable checks and fixed minor bugs #378

GermanAizek · 2022-05-25T09:33:21Z

@Klocman, review pr code changes and feedback me.

Klocman

Thank you for the PR!

Most of the changes are unnecessary as explained in the comments. Please either undo them or place the DisplayVersion fix and other fixes to confirmed issues in a separate PR.

Klocman · 2022-06-11T15:36:27Z

source/BulkCrapUninstaller/Functions/AppPropertiesGatherer.cs

-            var valueNames = targetKey.GetValueNames();
+            var valueNames = targetKey?.GetValueNames();


With the check added this will throw a nullreference in the next line instead.

Klocman · 2022-06-11T15:37:14Z

source/BulkCrapUninstaller/Functions/AppUninstaller.cs

@@ -549,7 +549,7 @@ public void UninstallFromDirectory(IEnumerable<ApplicationUninstallerEntry> allU
                        if (item.UninstallPossible && item.UninstallerKind != UninstallerType.SimpleDelete &&
                            MessageBoxes.UninstallFromDirectoryUninstallerFound(item.DisplayName, item.UninstallString))
                        {
-                            item.RunUninstaller(false, Settings.Default.AdvancedSimulate).WaitForExit(60000);
+                            item?.RunUninstaller(false, Settings.Default.AdvancedSimulate).WaitForExit(60000);


With the check added this will throw a nullreference in the next line instead.

Klocman · 2022-06-11T15:37:35Z

source/BulkCrapUninstaller/Functions/Ratings/RatingRenderer.cs

@@ -30,7 +30,7 @@ public override void Render(Graphics g, Rectangle r)
            r = ApplyCellPadding(r);

            // Convert our aspect to a numeric value
-            var aspect = (RatingEntry) Aspect;
+            var aspect = (RatingEntry) (Aspect ?? false);


This will throw an invalid cast exception.

Klocman · 2022-06-11T15:38:15Z

source/BulkCrapUninstaller/Functions/Ratings/RatingRenderer.cs

@@ -43,7 +43,7 @@ public override void Render(Graphics g, Rectangle r)
                // Calculate how many images we need to draw to represent our aspect value
                int numberOfImages;
                if (aspectValue <= _minimumValue) numberOfImages = 1;
-                else if (aspectValue <= (_maximumValue + _minimumValue)/2) numberOfImages = 2;
+                else if (aspectValue <= (float) (_maximumValue + _minimumValue) / 2) numberOfImages = 2;


I believe the clamping is intentional.

Klocman · 2022-06-11T15:38:54Z

source/KlocTools/Controls/WindowTargeter.cs

@@ -48,7 +48,7 @@ private void SearcherOnHoveredWindowChanged(object sender, WindowHoverEventArgs
        {
            label1.Text = windowHoverEventArgs.TargetWindow.WindowText;
            label2.Text = windowHoverEventArgs.TargetWindow.WindowRect.ToString();
-            label3.Text = windowHoverEventArgs.TargetWindow.GetRunningProcess().MainModule.FileName;
+            label3.Text = windowHoverEventArgs.TargetWindow?.GetRunningProcess().MainModule.FileName;


This can never be null.

Klocman · 2022-06-11T15:40:19Z

source/ObjectListView/DragDrop/DropSink.cs

-                        info = this.ListView.OlvHitTest(pt.X, pt.Y - SMALL_VALUE);
-                        if (info.Item != null) {
-                            targetIndex = info.Item.Index;
+                if (info.Item != null)


This should never be null.

Klocman · 2022-06-11T15:41:39Z

source/UninstallTools/Controls/UninstallListEditor.cs

@@ -193,7 +193,7 @@ private void RefreshSelectedFilter()
            var item = listView1.SelectedItems[0];
            var tag = CurrentlySelected;

-            item.SubItems[0].Text = tag.Name;
+            item.SubItems[0].Text = tag?.Name;


With the check added this will throw a nullreference below instead.

Klocman · 2022-06-11T15:42:39Z

source/UninstallTools/Factory/DirectoryFactory.cs

@@ -128,7 +128,7 @@ IEnumerable<DirectoryInfo> FindDirsOnDrive(DriveInfo d)
            {
                try
                {
-                    return x.GetDirectories();
+                    return x?.GetDirectories();


This can never be null.

Klocman · 2022-06-11T15:43:02Z

source/UninstallTools/Factory/InfoAdders/GenerateSteamHelperStrings.cs

@@ -14,7 +14,7 @@ public void AddMissingInformation(ApplicationUninstallerEntry target)
        {
            if (target.UninstallerKind != UninstallerType.Steam || !SteamFactory.SteamHelperIsAvailable) return;

-            var appId = target.RatingId.Split(new[] { " " }, StringSplitOptions.RemoveEmptyEntries).Last();
+            var appId = target?.RatingId.Split(new[] { " " }, StringSplitOptions.RemoveEmptyEntries).Last();


This can never be null.

Klocman · 2022-06-11T15:43:12Z

source/UninstallTools/Factory/InfoAdders/MsiInfoAdder.cs

@@ -80,7 +80,7 @@ private static void ApplyMsiInfo(ApplicationUninstallerEntry entry, Guid guid)
            if (!temp.IsNotEmpty()) return;
            try
            {
-                entry.InstallDate = new DateTime(int.Parse(temp.Substring(0, 4)),
+                entry.InstallDate = new DateTime(int.Parse(temp?.Substring(0, 4)),


This can never be null.

Includes null check from #378

Klocman · 2022-08-08T20:40:56Z

I added fixes to confirmed issues in separate commits, so I'll be closing the PR now. Thank you for finding these.

GermanAizek · 2022-08-08T20:45:05Z

@Klocman, ok. Thx for contribution!

More nullable checks and fixed minor bugs

3bb4ab4

Klocman requested changes Jun 11, 2022

View reviewed changes

Klocman added a commit that referenced this pull request Aug 8, 2022

Fixed VersionCleaner not working (thanks to @GermanAizek in #378)

07cb9a6

Klocman added a commit that referenced this pull request Aug 8, 2022

Improved code checking for updates

244ce49

Includes null check from #378

Klocman added a commit that referenced this pull request Aug 8, 2022

Fixed minor issues in ObjectListView (thanks to @GermanAizek in #378)

052719c

Klocman closed this Aug 8, 2022

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

More nullable checks and fixed minor bugs #378

More nullable checks and fixed minor bugs #378

GermanAizek commented May 25, 2022 •

edited

Loading

Klocman left a comment •

edited

Loading

Klocman Jun 11, 2022

Klocman Jun 11, 2022

Klocman Jun 11, 2022

Klocman Jun 11, 2022

Klocman Jun 11, 2022

Klocman Jun 11, 2022

Klocman Jun 11, 2022

Klocman Jun 11, 2022

Klocman Jun 11, 2022

Klocman Jun 11, 2022

Klocman commented Aug 8, 2022

GermanAizek commented Aug 8, 2022

		var valueNames = targetKey.GetValueNames();
		var valueNames = targetKey?.GetValueNames();

More nullable checks and fixed minor bugs #378

More nullable checks and fixed minor bugs #378

Conversation

GermanAizek commented May 25, 2022 • edited Loading

Klocman left a comment • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Klocman commented Aug 8, 2022

GermanAizek commented Aug 8, 2022

GermanAizek commented May 25, 2022 •

edited

Loading

Klocman left a comment •

edited

Loading