Don't add buffers with an empty name

westor7 · Jun 13, 2020 · b3df871 · b3df871
1 parent 52fe1e3
commit b3df871
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/src/libs/BouncerProvider.js b/src/libs/BouncerProvider.js
@@ -163,6 +163,13 @@ export default class BouncerProvider {
         let buffers = await client.bnc.getBuffers(bncNetwork.connection.bncnetid);
         buffers.forEach((buffer) => {
             let newBuffer = this.state.addBuffer(bncNetwork.id, buffer.name);
+            if (!newBuffer) {
+                // The BNC might be giving up bad buffer names or something, so just make sure
+                // that it's handled if it ever coccurs
+                log.error(`Couldn't add BNC network, '${buffer.name}'`, buffer);
+                return;
+            }
+
             if (buffer.joined) {
                 newBuffer.enabled = true;
                 newBuffer.joined = true;

diff --git a/src/libs/state.js b/src/libs/state.js
@@ -471,6 +471,10 @@ function createNewState() {
             },
 
             addBuffer(networkid, bufferName) {
+                if (!bufferName) {
+                    return false;
+                }
+
                 // If we already have this buffer, don't re-add it
                 let buffer = this.getBufferByName(networkid, bufferName);
                 if (buffer) {