Merge pull request #20 from jwillemsen/master

Check for a nil pointer passed to string_to_ObjectId, resolves several C...

1 files changed, 7 insertions, 0 deletions

diff --git a/TAO/tao/PortableServer/PortableServer_Functions.cpp b/TAO/tao/PortableServer/PortableServer_Functions.cpp
index 853bd2b7ea2..fe9c1f5f45a 100644
--- a/TAO/tao/PortableServer/PortableServer_Functions.cpp
+++ b/TAO/tao/PortableServer/PortableServer_Functions.cpp
@@ -9,6 +9,13 @@ namespace PortableServer
   PortableServer::ObjectId *
   string_to_ObjectId (const char *string)
   {
+    // Passing in a nil pointer is illegal so throw an exception to
+    // indicate that
+    if (string == 0)
+    {
+      throw ::CORBA::BAD_PARAM ();
+    }
+
     // Size of string
     //
     // We DO NOT include the zero terminator, as this is simply an