Merge pull request #24821 from vespa-engine/havardpe/fbench-exit-on-bad-base64-input

fail on bad base64 POST data

1 files changed, 8 insertions, 1 deletions

diff --git a/fbench/src/fbench/client.cpp b/fbench/src/fbench/client.cpp
index f3e6fba2cf1..5c064159c65 100644
--- a/fbench/src/fbench/client.cpp
+++ b/fbench/src/fbench/client.cpp
@@ -227,7 +227,14 @@ Client::run()
             const char* content = urlSource.content();
             std::string base64_decoded;
             if (_args->_usePostMode && _args->_base64Decode) {
-                base64_decoded = Base64::decode(content, cLen);
+                try {
+                    base64_decoded = Base64::decode(content, cLen);
+                } catch (std::exception &e) {
+                    std::string msg = "POST request contains invalid base64 encoded data: ";
+                    msg.append(e.what());
+                    _status->SetError(msg.c_str());
+                    break;
+                }
                 content = base64_decoded.c_str();
                 cLen = base64_decoded.size();
             }