don't crash with bad ExternalViewers entri

kjk · kjk · commit d65baaf49977 · 2022-06-01T21:13:30.000-04:00
diff --git a/src/Menu.cpp b/src/Menu.cpp
@@ -1148,18 +1148,18 @@ static void AppendExternalViewersToMenu(HMENU menuFile, const WCHAR* filePath) {
         if (count >= maxEntries) {
             break;
         }
-        if (!ev->commandLine) {
+        if (str::EmptyOrWhiteSpaceOnly(ev->commandLine)) {
             continue;
         }
         if (ev->filter && !(filePath && PathMatchFilter(filePath, ev->filter))) {
             continue;
         }
 
         WCHAR* name = ToWstrTemp(ev->name);
-        if (str::IsEmpty(name)) {
+        if (str::EmptyOrWhiteSpaceOnly(ev->name)) {
             CmdLineArgsIter args(ToWstrTemp(ev->commandLine));
             int nArgs = args.nArgs - 2;
-            if (nArgs == 0) {
+            if (nArgs <= 0) {
                 continue;
             }
             WCHAR* arg0 = args.at(2 + 0);

Original file line number	Diff line number	Diff line change
`@@ -1148,18 +1148,18 @@ static void AppendExternalViewersToMenu(HMENU menuFile, const WCHAR* filePath) {`
`1148`	`1148`	`if (count >= maxEntries) {`
`1149`	`1149`	`break;`
`1150`	`1150`	`}`
`1151`		`- if (!ev->commandLine) {`
	`1151`	`+ if (str::EmptyOrWhiteSpaceOnly(ev->commandLine)) {`
`1152`	`1152`	`continue;`
`1153`	`1153`	`}`
`1154`	`1154`	`if (ev->filter && !(filePath && PathMatchFilter(filePath, ev->filter))) {`
`1155`	`1155`	`continue;`
`1156`	`1156`	`}`
`1157`	`1157`
`1158`	`1158`	`WCHAR* name = ToWstrTemp(ev->name);`
`1159`		`- if (str::IsEmpty(name)) {`
	`1159`	`+ if (str::EmptyOrWhiteSpaceOnly(ev->name)) {`
`1160`	`1160`	`CmdLineArgsIter args(ToWstrTemp(ev->commandLine));`
`1161`	`1161`	`int nArgs = args.nArgs - 2;`
`1162`		`- if (nArgs == 0) {`
	`1162`	`+ if (nArgs <= 0) {`
`1163`	`1163`	`continue;`
`1164`	`1164`	`}`
`1165`	`1165`	`WCHAR* arg0 = args.at(2 + 0);`