From 033f4eef59fdb7cc32018b162114511448bc46a6 Mon Sep 17 00:00:00 2001
From: jcesarmobile <jcesarmobile@gmail.com>
Date: Fri, 17 Dec 2021 17:55:45 +0100
Subject: [PATCH] fix(cli): Escape appName from invalid characters on add
 (#5325)

---
 cli/src/android/common.ts | 11 ++++++-----
 cli/src/ios/common.ts     |  5 ++++-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/cli/src/android/common.ts b/cli/src/android/common.ts
index 2d4252fb43..a908c486f2 100644
--- a/cli/src/android/common.ts
+++ b/cli/src/android/common.ts
@@ -71,7 +71,11 @@ export async function editProjectSettingsAndroid(
   config: Config,
 ): Promise<void> {
   const appId = config.app.appId;
-  const appName = config.app.appName;
+  const appName = config.app.appName
+    .replace(/&/g, '&amp;')
+    .replace(/</g, '&lt;')
+    .replace(/"/g, '\\"')
+    .replace(/'/g, "\\'");
 
   const manifestPath = resolve(
     config.android.srcMainDirAbs,
@@ -140,10 +144,7 @@ export async function editProjectSettingsAndroid(
   const stringsPath = resolve(config.android.resDirAbs, 'values/strings.xml');
   let stringsContent = await readFile(stringsPath, { encoding: 'utf-8' });
   stringsContent = stringsContent.replace(/com.getcapacitor.myapp/g, appId);
-  stringsContent = stringsContent.replace(
-    /My App/g,
-    appName.replace(/'/g, `\\'`),
-  );
+  stringsContent = stringsContent.replace(/My App/g, appName);
 
   await writeFile(stringsPath, stringsContent);
 }
diff --git a/cli/src/ios/common.ts b/cli/src/ios/common.ts
index 4a254b80d4..55d9a2cab0 100644
--- a/cli/src/ios/common.ts
+++ b/cli/src/ios/common.ts
@@ -64,7 +64,10 @@ export async function resolvePlugin(plugin: Plugin): Promise<Plugin | null> {
  */
 export async function editProjectSettingsIOS(config: Config): Promise<void> {
   const appId = config.app.appId;
-  const appName = config.app.appName;
+  const appName = config.app.appName
+    .replace(/&/g, '&amp;')
+    .replace(/</g, '&lt;')
+    .replace(/>/g, '&gt;');
 
   const pbxPath = `${config.ios.nativeXcodeProjDirAbs}/project.pbxproj`;
   const plistPath = resolve(config.ios.nativeTargetDirAbs, 'Info.plist');