fix null guard

AdguardTeam · Nov 7, 2022 · b3b8d29 · b3b8d29
1 parent 639ab15
commit b3b8d29
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/src/helpers/cookie-utils.js b/src/helpers/cookie-utils.js
@@ -38,10 +38,6 @@ export const getCookiePath = (rawPath) => {
  */
 export const concatCookieNameValuePath = (rawName, rawValue, rawPath) => {
     const log = console.log.bind(console); // eslint-disable-line no-console
-    if (rawValue === null) {
-        log(`Invalid cookie value: '${rawValue}'`);
-        return null;
-    }
     if (!isValidCookieRawPath(rawPath)) {
         log(`Invalid cookie path: '${rawPath}'`);
         return null;

diff --git a/src/scriptlets/set-cookie-reload.js b/src/scriptlets/set-cookie-reload.js
@@ -50,7 +50,15 @@ export function setCookieReload(source, name, value, path = '/') {
         return;
     }
 
+    // eslint-disable-line no-console
+    const log = console.log.bind(console);
+
     const validValue = getLimitedCookieValue(value);
+    if (validValue === null) {
+        log(`Invalid cookie value: '${validValue}'`);
+        return;
+    }
+
     const cookieData = concatCookieNameValuePath(name, validValue, path);
 
     if (cookieData) {

diff --git a/src/scriptlets/set-cookie.js b/src/scriptlets/set-cookie.js
@@ -46,7 +46,15 @@ import {
  */
 /* eslint-enable max-len */
 export function setCookie(source, name, value, path = '/') {
+    // eslint-disable-line no-console
+    const log = console.log.bind(console);
+
     const validValue = getLimitedCookieValue(value);
+    if (validValue === null) {
+        log(`Invalid cookie value: '${validValue}'`);
+        return;
+    }
+
     const cookieData = concatCookieNameValuePath(name, validValue, path);
 
     if (cookieData) {