Merge commit '2.5.0' into moonshot-packaging-fixes

[shibboleth/sp.git] / fastcgi / shibresponder.cpp
diff --git a/fastcgi/shibresponder.cpp b/fastcgi/shibresponder.cpp

index 030d6cb..5783f4b 100644 (file)
--- a/fastcgi/shibresponder.cpp
+++ b/fastcgi/shibresponder.cpp
@@ -343,8 +343,9 @@ int main(void)
          // Although FastCGI supports writing before reading,
          // many http clients (browsers) don't support it (so
          // the connection deadlocks until a timeout expires!).
-        char* content;
+        char* content = nullptr;
          gstdin(&request, &content);
+        auto_arrayptr<char> wrapper(content);
  
          try {
              xmltooling::NDC ndc("FastCGI shibresponder");
@@ -384,8 +385,6 @@ int main(void)
              print_error("<html><body>FastCGI Shibboleth responder caught an exception, check log for details.</body></html>");
          }
  
-        delete[] content;
-
          // If the output streambufs had non-zero bufsizes and
          // were constructed outside of the accept loop (i.e.
          // their destructor won't be called here), they would