commit 54493e56e429f5d7ca1eca38cada92e033ffeea4
author Bill Blough <billblough@apache.org> Sun May 06 02:45:21 2018 +0000
committer Bill Blough <billblough@apache.org> Sun May 06 02:45:21 2018 +0000
tree 0b676e4474034ddb4afa8733521e59c3f9fc974b
parent 61fa74ffbbaf9ba2d414b2de3bf5d823ec2ee644

Apply http_transport_utils fixes from AXISC-1669

src/core/transport/http/util/http_transport_utils.c

diff --git a/src/core/transport/http/util/http_transport_utils.c b/src/core/transport/http/util/http_transport_utils.c
index a360d88..12a8eba 100644
--- a/src/core/transport/http/util/http_transport_utils.c
+++ b/src/core/transport/http/util/http_transport_utils.c
@@ -776,7 +776,11 @@
                 soap_envelope = axiom_soap_envelope_create_default_soap_envelope(env, AXIOM_SOAP11);
                 def_body = axiom_soap_envelope_get_body(soap_envelope, env);
                 om_doc = axiom_stax_builder_get_document(om_builder, env);
-				root_node = axiom_document_get_root_element(om_doc, env);
+                if (!om_doc)
+                    return AXIS2_FAILURE;
+                root_node = axiom_document_get_root_element(om_doc, env);
+                if (!root_node)
+                    return AXIS2_FAILURE;
                 root_node = axiom_document_build_all(om_doc, env);
                 axiom_soap_body_add_child(def_body, env, root_node);
             }
@@ -1236,7 +1240,11 @@
                 soap_envelope = axiom_soap_envelope_create_default_soap_envelope(env, AXIOM_SOAP11);
                 def_body = axiom_soap_envelope_get_body(soap_envelope, env);
                 om_doc = axiom_stax_builder_get_document(om_builder, env);
-				root_node = axiom_document_get_root_element(om_doc, env);
+                if (!om_doc)
+                    return AXIS2_FAILURE;
+                root_node = axiom_document_get_root_element(om_doc, env);
+                if (!root_node)
+                    return AXIS2_FAILURE;
                 root_node = axiom_document_build_all(om_doc, env);
                 axiom_soap_body_add_child(def_body, env, root_node);
             }
@@ -2428,10 +2436,26 @@
         soap_envelope = axiom_soap_envelope_create_default_soap_envelope(env, AXIOM_SOAP11);
         def_body = axiom_soap_envelope_get_body(soap_envelope, env);
         om_doc = axiom_stax_builder_get_document(om_builder, env);
-		root_node = axiom_document_get_root_element(om_doc, env);
-		root_node = axiom_document_build_all(om_doc, env);
+        if (!om_doc)
+            return AXIS2_FAILURE;
+        root_node = axiom_document_get_root_element(om_doc, env);
+        if (!root_node)
+            return AXIS2_FAILURE;
+        root_node = axiom_document_build_all(om_doc, env);
         axiom_soap_body_add_child(def_body, env, root_node);
         axiom_stax_builder_free_self(om_builder, env);
+
+        if(stream)
+        {
+            axutil_stream_free(stream, env);
+            callback_ctx->in_stream = NULL;
+        }
+        if(callback_ctx->chunked_stream)
+        {
+            axutil_http_chunked_stream_free(callback_ctx->chunked_stream, env);
+            callback_ctx->chunked_stream = NULL;
+        }
+
     }
 
     return soap_envelope;