Merge pull request #452 from Flow-Launcher/releaseComObject

jjw24 · web-flow · commit 76159d6cd09c · 2021-05-24T21:12:23.000+10:00
Avoid AppxManifest.xml leak
diff --git a/Plugins/Flow.Launcher.Plugin.Program/Programs/UWP.cs b/Plugins/Flow.Launcher.Plugin.Program/Programs/UWP.cs
@@ -17,6 +17,7 @@
 using Flow.Launcher.Plugin.Program.Logger;
 using Rect = System.Windows.Rect;
 using Flow.Launcher.Plugin.SharedModels;
+using Flow.Launcher.Infrastructure.Logger;
 
 namespace Flow.Launcher.Plugin.Program.Programs
 {
@@ -81,6 +82,11 @@ private void InitializeAppInfo()
 
                 Apps = new List<Application>().ToArray();
             }
+
+            if (Marshal.ReleaseComObject(stream) > 0)
+            {
+                Log.Error("Flow.Launcher.Plugin.Program.Programs.UWP", "AppxManifest.xml was leaked");
+            }
         }
 
 
diff --git a/Plugins/Flow.Launcher.Plugin.Program/plugin.json b/Plugins/Flow.Launcher.Plugin.Program/plugin.json
@@ -4,7 +4,7 @@
   "Name": "Program",
   "Description": "Search programs in Flow.Launcher",
   "Author": "qianlifeng",
-  "Version": "1.5.0",
+  "Version": "1.5.1",
   "Language": "csharp",
   "Website": "https://github.com/Flow-Launcher/Flow.Launcher",
   "ExecuteFileName": "Flow.Launcher.Plugin.Program.dll",

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,7 @@`
`17`	`17`	`using Flow.Launcher.Plugin.Program.Logger;`
`18`	`18`	`using Rect = System.Windows.Rect;`
`19`	`19`	`using Flow.Launcher.Plugin.SharedModels;`
	`20`	`+using Flow.Launcher.Infrastructure.Logger;`
`20`	`21`
`21`	`22`	`namespace Flow.Launcher.Plugin.Program.Programs`
`22`	`23`	`{`
`@@ -81,6 +82,11 @@ private void InitializeAppInfo()`
`81`	`82`
`82`	`83`	`Apps = new List<Application>().ToArray();`
`83`	`84`	`}`
	`85`	`+`
	`86`	`+ if (Marshal.ReleaseComObject(stream) > 0)`
	`87`	`+ {`
	`88`	`+ Log.Error("Flow.Launcher.Plugin.Program.Programs.UWP", "AppxManifest.xml was leaked");`
	`89`	`+ }`
`84`	`90`	`}`
`85`	`91`
`86`	`92`