Merge pull request #474 from chakflying/fix/dirty-path

Fix: Check for non-ASCII before using dirtyPath
ExpressLRS · Feb 5, 2023 · 23808d2 · 23808d2
2 parents 4e5f7bb + dbb0d27
commit 23808d2
Showing 1 changed file with 16 additions and 5 deletions.
diff --git a/src/main.dev.ts b/src/main.dev.ts
@@ -62,19 +62,30 @@ logger.log('path', {
   PATH: process.env.PATH,
 });
 
+function isASCII(str: string) {
+  return /^[\x20-\x7F]*$/.test(str);
+}
+
 const isWindows = process.platform.startsWith('win');
 const isMacOS = process.platform.startsWith('darwin');
 let userDataDirectory = app.getPath('userData');
+
 if (isWindows) {
   const dirtyUserDataDirectory = app.isPackaged
     ? path.join('c:', `.${packageJson.name}`)
     : path.join('c:', `.${packageJson.name}-dev`);
   try {
-    mkdirp.sync(dirtyUserDataDirectory);
-    userDataDirectory = dirtyUserDataDirectory;
-    logger.log(
-      `using ${dirtyUserDataDirectory} directory for firmware storage`
-    );
+    if (!isASCII(userDataDirectory)) {
+      mkdirp.sync(dirtyUserDataDirectory);
+      userDataDirectory = dirtyUserDataDirectory;
+      logger.log(
+        `Non-ASCII path detected, using ${dirtyUserDataDirectory} directory for firmware storage`
+      );
+    } else {
+      logger.log(
+        `using appdata path ${userDataDirectory} for firmware storage`
+      );
+    }
   } catch (err) {
     logger.error(
       'failed to create c:/.expresslrs directory, will use usual path',