Safer usage of Buffer.from

simple-icons · Dec 22, 2024 · 9f869f6 · 9f869f6
1 parent 413d2e0
commit 9f869f6
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 8 deletions.
diff --git a/lib/index.mjs b/lib/index.mjs
diff --git a/src/create.js b/src/create.js
@@ -39,6 +39,9 @@ const OUTPUT_NEW_VERSION_NAME = 'new-version';
 // Helper functions
 function decode(data, encoding) {
   if (encoding === BASE64) {
+    if (typeof data !== 'string') {
+      return '';
+    }
     const dataBuffer = Buffer.from(data, BASE64);
     return dataBuffer.toString(UTF8);
   } else {
@@ -326,10 +329,15 @@ async function getChangesFromFile(core, file, client, context, id) {
         ref: file.sha,
       });
 
-      filePatch = Buffer.from(
-        contentResult.content,
-        contentResult.encoding,
-      ).toString();
+      if (
+        typeof contentResult.content === 'string' &&
+        typeof contentResult.encoding === 'string'
+      ) {
+        filePatch = Buffer.from(
+          contentResult.content,
+          contentResult.encoding,
+        ).toString();
+      }
     }
 
     const sourceChanges = [
@@ -497,7 +505,9 @@ function createReleaseNotes(newVersion, newIcons, updatedIcons, removedIcons) {
 
   let releaseNotes = '';
   if (newIcons.length > 0) {
-    releaseNotes += `\n## ${newIcons.length} new ${newIcons.length > 1 ? 'icons' : 'icon'}\n\n`;
+    releaseNotes += `\n## ${newIcons.length} new ${
+      newIcons.length > 1 ? 'icons' : 'icon'
+    }\n\n`;
     for (let newIcon of newIcons.sort(sortAlphabetically)) {
       const prs = prNumbersToString(newIcon.prNumbers);
       const authors = authorsToString(newIcon.authors);
@@ -506,7 +516,9 @@ function createReleaseNotes(newVersion, newIcons, updatedIcons, removedIcons) {
   }
 
   if (updatedIcons.length > 0) {
-    releaseNotes += `\n## ${updatedIcons.length} updated ${updatedIcons.length > 1 ? 'icons' : 'icon'}\n\n`;
+    releaseNotes += `\n## ${updatedIcons.length} updated ${
+      updatedIcons.length > 1 ? 'icons' : 'icon'
+    }\n\n`;
     for (let updatedIcon of updatedIcons.sort(sortAlphabetically)) {
       const prs = prNumbersToString(updatedIcon.prNumbers);
       const authors = authorsToString(updatedIcon.authors);
@@ -515,7 +527,9 @@ function createReleaseNotes(newVersion, newIcons, updatedIcons, removedIcons) {
   }
 
   if (removedIcons.length > 0) {
-    releaseNotes += `\n## ${removedIcons.length} removed ${removedIcons.length > 1 ? 'icons' : 'icon'}\n\n`;
+    releaseNotes += `\n## ${removedIcons.length} removed ${
+      removedIcons.length > 1 ? 'icons' : 'icon'
+    }\n\n`;
     for (let removedIcon of removedIcons.sort(sortAlphabetically)) {
       const prs = prNumbersToString(removedIcon.prNumbers);
       const authors = authorsToString(removedIcon.authors);