X-Git-Url: https://ruderich.org/simon/gitweb/?a=blobdiff_plain;f=src%2Fverify.c;h=63ca6da2d982a121d36cb8b6779e795ba0c72f30;hb=4f17e2a1251d1b460c51fd37f70ea85cd59eb1fa;hp=8328432b5e27e0174590c0c69cb97e92fc36c608;hpb=206479fb368638a916ac1c736df3835a1f0c35a5;p=tlsproxy%2Ftlsproxy.git

diff --git a/src/verify.c b/src/verify.c
index 8328432..63ca6da 100644
--- a/src/verify.c
+++ b/src/verify.c
@@ -157,6 +157,8 @@ int verify_tls_connection(gnutls_session_t session, const char *hostname) {
 
 int server_certificate_path(FILE **file, const char *hostname,
                             char *path, size_t size) {
+    int result;
+
     /* Hostname too long. */
     if (size - strlen(STORED_SERVER_CERT_FORMAT) <= strlen(hostname)) {
         LOG(LOG_WARNING,
@@ -171,14 +173,29 @@ int server_certificate_path(FILE **file, const char *hostname,
             hostname);
         return -1;
     }
-    snprintf(path, size, STORED_SERVER_CERT_FORMAT, hostname);
+    result = snprintf(path, size, STORED_SERVER_CERT_FORMAT, hostname);
+    if (result < 0) {
+        LOG_PERROR(LOG_ERROR,
+                   "server_certificate_path(): snprintf failed");
+        return -1;
+    } else if ((size_t)result >= size) {
+        LOG(LOG_ERROR,
+            "server_certificate_path(): snprintf buffer too short");
+        return -1;
+    }
 
     /* Open the stored certificate file. */
     *file = fopen(path, "rb");
     if (NULL == *file) {
-        LOG(global_passthrough_unknown ? LOG_DEBUG : LOG_WARNING,
-            "server_certificate_path(): failed to open '%s': %s",
-            path, strerror(errno));
+        if (global_passthrough_unknown) {
+            LOG(LOG_DEBUG,
+                "server_certificate_path(): failed to open '%s': %s",
+                path, strerror(errno));
+        } else {
+            LOG(LOG_WARNING,
+                "server_certificate_path(): failed to open '%s': %s",
+                path, strerror(errno));
+        }
         /* Couldn't open the file, special case. */
         return -2;
     }