From: Amos Jeffries <squid3@treenet.co.nz>
Date: Fri, 16 Nov 2012 04:08:22 +0000 (-0700)
Subject: digest_ldap_auth: Fix crash on empty password
X-Git-Tag: SQUID_3_4_0_1~501
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aa8c6def5f3bdbabb04f0f217f1b96677cb792a1;p=thirdparty%2Fsquid.git

digest_ldap_auth: Fix crash on empty password

 Detected by Coverity Scan. Issue 740399
---

diff --git a/helpers/digest_auth/LDAP/ldap_backend.cc b/helpers/digest_auth/LDAP/ldap_backend.cc
index 46409866ef..ec50e7bb7b 100644
--- a/helpers/digest_auth/LDAP/ldap_backend.cc
+++ b/helpers/digest_auth/LDAP/ldap_backend.cc
@@ -263,7 +263,8 @@ retrydnattr:
             value = values;
             while (*value) {
                 if (encrpass) {
-                    if (strcmp(strtok(*value, delimiter), realm) == 0) {
+                    const char *t = strtok(*value, delimiter);
+                    if (t && strcmp(t, realm) == 0) {
                         password = strtok(NULL, delimiter);
                         break;
                     }