fix crash if ExternalViewers only has CommandLine (fixes #2691)

sumatrapdfreader · Jun 7, 2022 · 7a19622 · 7a19622
1 parent 7ae1fe4
commit 7a19622
Showing 1 changed file with 6 additions and 9 deletions.
diff --git a/src/Menu.cpp b/src/Menu.cpp
@@ -1156,18 +1156,15 @@ static void AppendExternalViewersToMenu(HMENU menuFile, const WCHAR* filePath) {
         }
 
         WCHAR* name = ToWstrTemp(ev->name);
-        if (str::EmptyOrWhiteSpaceOnly(ev->name)) {
+        if (!ev->name || str::EmptyOrWhiteSpaceOnly(ev->name)) {
             CmdLineArgsIter args(ToWstrTemp(ev->commandLine));
-            int nArgs = args.nArgs - 2;
-            if (nArgs <= 0) {
+            int nArgs = args.nArgs;
+            if (nArgs < 1) {
                 continue;
             }
-            WCHAR* arg0 = args.at(2 + 0);
-            name = str::DupTemp(path::GetBaseNameTemp(arg0));
-            WCHAR* ext = (WCHAR*)path::GetExtTemp(name);
-            if (ext) {
-                *ext = 0;
-            }
+            WCHAR* exePath = args.at(0);
+            const WCHAR* exeName = path::GetBaseNameTemp(exePath);
+            name = str::DupTemp(exeName);
         }
 
         AutoFreeWstr menuString(str::Format(_TR("Open in %s"), name));