Require exact match for environment variables before they are interpreted as options (rather than simply matching as a prefix to an option name).

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@788439 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 2 insertions, 1 deletions

diff --git a/cpp/src/qpid/Options.cpp b/cpp/src/qpid/Options.cpp
index e521b1220a..cc48323266 100644
--- a/cpp/src/qpid/Options.cpp
+++ b/cpp/src/qpid/Options.cpp
@@ -55,7 +55,8 @@ struct EnvOptMapper {
     }
 
     static bool matchStr(const string& env, boost::shared_ptr<po::option_description> desc) {
-        return std::equal(env.begin(), env.end(), desc->long_name().begin(), &matchChar);
+        return desc->long_name().size() == env.size() &&
+            std::equal(env.begin(), env.end(), desc->long_name().begin(), &matchChar);
     }
             
     static bool matchCase(const string& env, boost::shared_ptr<po::option_description> desc) {