Changed code to throw MarshalException if a request or reply contains a

    facet path with more than one element, and to throw
    ProxyUnmarshalException if a proxy has a facet path with more than on
    element.

1 files changed, 5 insertions, 1 deletions

diff --git a/cpp/src/Ice/ReferenceFactory.cpp b/cpp/src/Ice/ReferenceFactory.cpp
index 1ed3a31992e..2c5e9c0c4dd 100644
--- a/cpp/src/Ice/ReferenceFactory.cpp
+++ b/cpp/src/Ice/ReferenceFactory.cpp
@@ -475,8 +475,12 @@ IceInternal::ReferenceFactory::create(const Identity& ident, BasicStream* s)
     vector<string> facetPath;
     s->read(facetPath);
     string facet;
-    if(!facetPath.empty()) // TODO: Throw an exception if facetPath has more than one element?
+    if(!facetPath.empty())
     {
+	if(facetPath.size() > 1)
+	{
+	    throw ProxyUnmarshalException(__FILE__, __LINE__);
+	}
 	facet.swap(facetPath[0]);
     }