From b48f00864ac2495bf113d2117584c1ab7b0e0b83 Mon Sep 17 00:00:00 2001
From: Kevin Jacobs <kjacobs@mozilla.com>
Date: Fri, 3 May 2019 12:40:53 +1000
Subject: [PATCH] Bug 1540652 - softoken/sdb.c: Logically dead code, r=keeler

Test Plan: https://treeherder.mozilla.org/#/jobs?repo=nss-try&revision=b7bd9acb3ca38a1db10c35c295b9bfcae44a5074

Reviewers: keeler

Reviewed By: keeler

Subscribers: mt

Bug #: 1540652

Differential Revision: https://phabricator.services.mozilla.com/D27191

--HG--
extra : rebase_source : c72a1034449add462856d5ab19140059560b631f
---
 lib/softoken/sdb.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/lib/softoken/sdb.c b/lib/softoken/sdb.c
index 142cb5ddaa..b7d4edc05e 100644
--- a/lib/softoken/sdb.c
+++ b/lib/softoken/sdb.c
@@ -899,10 +899,8 @@ sdb_GetAttributeValueNoLock(SDB *sdb, CK_OBJECT_HANDLE object_id,
         }
         columns = newColumns;
     }
-    if (!columns) {
-        error = CKR_OBJECT_HANDLE_INVALID;
-        goto loser;
-    }
+
+    PORT_Assert(columns);
 
     char *statement = sqlite3_mprintf("SELECT DISTINCT %s FROM %s where id=$ID LIMIT 1;",
                                       columns, table);