From 1fb6207e53abb646fdc0936637b5ae5e973fe541 Mon Sep 17 00:00:00 2001
From: Matt Gibson <mgibson@bitwarden.com>
Date: Wed, 31 Aug 2022 16:03:04 -0400
Subject: [PATCH] Handle null in utils

---
 libs/common/spec/misc/utils.spec.ts | 6 ++++++
 libs/common/src/misc/utils.ts       | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/libs/common/spec/misc/utils.spec.ts b/libs/common/spec/misc/utils.spec.ts
index d4dbac958a8..3978f9cfed8 100644
--- a/libs/common/spec/misc/utils.spec.ts
+++ b/libs/common/spec/misc/utils.spec.ts
@@ -70,4 +70,10 @@ describe("Utils Service", () => {
       expect(Utils.newGuid()).toMatch(validGuid);
     });
   });
+
+  describe("fromByteStringToArray", () => {
+    it("should handle null", () => {
+      expect(Utils.fromByteStringToArray(null)).toEqual(null);
+    });
+  });
 });
diff --git a/libs/common/src/misc/utils.ts b/libs/common/src/misc/utils.ts
index 524c4384703..7552bea188c 100644
--- a/libs/common/src/misc/utils.ts
+++ b/libs/common/src/misc/utils.ts
@@ -97,6 +97,9 @@ export class Utils {
   }
 
   static fromByteStringToArray(str: string): Uint8Array {
+    if (str == null) {
+      return null;
+    }
     const arr = new Uint8Array(str.length);
     for (let i = 0; i < str.length; i++) {
       arr[i] = str.charCodeAt(i);