From: Otto Moerbeek <otto.moerbeek@open-xchange.com>
Date: Fri, 7 Jan 2022 08:14:21 +0000 (+0100)
Subject: Kill string leaks in processError
X-Git-Tag: rec-4.8.0-alpha1~31^2~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6688c8c6c37c0a6dbd516f0a75adf131e9cea3ab;p=thirdparty%2Fpdns.git

Kill string leaks in processError
---

diff --git a/pdns/gss_context.cc b/pdns/gss_context.cc
index 17cc3b59a1..3d5528016d 100644
--- a/pdns/gss_context.cc
+++ b/pdns/gss_context.cc
@@ -506,9 +506,14 @@ void GssContext::processError(const std::string& method, OM_uint32 maj, OM_uint3
   msg_ctx = 0;
   while (1) {
     ostringstream oss;
-    gss_display_status(&tmp_min, maj, GSS_C_GSS_CODE, GSS_C_NULL_OID, &msg_ctx, &msg);
-    oss << method << ": " << msg.value;
-    /// XXX leaks gss_buffer_desc?
+    if (gss_display_status(&tmp_min, maj, GSS_C_GSS_CODE, GSS_C_NULL_OID, &msg_ctx, &msg) == GSS_S_COMPLETE) {
+      oss << method << ": " << msg.value;
+    } else {
+      oss << method << ": ?";
+    }
+    if (msg.length != 0) {
+      gss_release_buffer(&tmp_min, &msg);
+    }
     d_gss_errors.push_back(oss.str());
     if (!msg_ctx)
       break;
@@ -516,9 +521,14 @@ void GssContext::processError(const std::string& method, OM_uint32 maj, OM_uint3
   msg_ctx = 0;
   while (1) {
     ostringstream oss;
-    gss_display_status(&tmp_min, min, GSS_C_MECH_CODE, GSS_C_NULL_OID, &msg_ctx, &msg);
-    oss << method << ": " << msg.value;
-    /// XXX leaks gss_buffer_desc?
+    if (gss_display_status(&tmp_min, min, GSS_C_MECH_CODE, GSS_C_NULL_OID, &msg_ctx, &msg) ==  GSS_S_COMPLETE) {
+      oss << method << ": " << msg.value;
+    } else {
+      oss << method << ": ?";
+    }
+    if (msg.length != 0) {
+      gss_release_buffer(&tmp_min, &msg);
+    }
     d_gss_errors.push_back(oss.str());
     if (!msg_ctx)
       break;