"SSL server certificate fingerprint ACL type" patch: trunk does not build on amd64...

diff --git a/src/acl/CertificateData.cc b/src/acl/CertificateData.cc
index fcb1487b45946b234239decfa690420870821458..83b6ac3b1a63609a5440600d2f1478d36129aae2 100644 (file)
--- a/src/acl/CertificateData.cc
+++ b/src/acl/CertificateData.cc
@@ -42,13 +42,13 @@
 ACLCertificateData::ACLCertificateData(Ssl::GETX509ATTRIBUTE *sslStrategy, const char *attrs, bool optionalAttr) : validAttributesStr(attrs), attributeIsOptional(optionalAttr), attribute (NULL), values (), sslAttributeCall (sslStrategy)
 {
     if (attrs) {
-        size_t current;
-        size_t next = -1;
+        size_t current = 0;
+        size_t next = std::string::npos;
         std::string valid(attrs);
         do {
-            current = next + 1;
             next = valid.find_first_of( "|", current);
-            validAttributes.push_back(valid.substr( current, next - current ));
+            validAttributes.push_back(valid.substr( current, (next == std::string::npos ? std::string::npos : next - current)));
+            current = next + 1;
         } while (next != std::string::npos);
     }
 }