diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-03-10 19:05:15 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2009-03-10 19:05:15 +0000 |
| commit | be9203a5b45d890efd47149e63b69b88bf80ddf4 (patch) | |
| tree | 7d6fc775b187aa910f5b00f80791fb7f8e9f989f | |
| parent | 9a7711074395f6e53f4a085795145614d372be71 (diff) | |
| download | ATCD-be9203a5b45d890efd47149e63b69b88bf80ddf4.tar.gz | |
Tue Mar 10 19:05:54 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl>
* tao/GIOP_Message_Generator_Parser_12.cpp:
Check return values of write_ulong
* tao/IIOP_Transport.cpp:
Use operator!
| -rw-r--r-- | TAO/ChangeLog | 8 | ||||
| -rw-r--r-- | TAO/tao/GIOP_Message_Generator_Parser_12.cpp | 14 | ||||
| -rw-r--r-- | TAO/tao/IIOP_Transport.cpp | 4 |
3 files changed, 19 insertions, 7 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index a1531d15f69..fe2fe94cd74 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -1,3 +1,11 @@ +Tue Mar 10 19:05:54 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> + + * tao/GIOP_Message_Generator_Parser_12.cpp: + Check return values of write_ulong + + * tao/IIOP_Transport.cpp: + Use operator! + Tue Mar 10 18:47:54 UTC 2009 Johnny Willemsen <jwillemsen@remedy.nl> * tao/GIOP_Message_Base.cpp: diff --git a/TAO/tao/GIOP_Message_Generator_Parser_12.cpp b/TAO/tao/GIOP_Message_Generator_Parser_12.cpp index 6c7fc8e9285..42919d6b40e 100644 --- a/TAO/tao/GIOP_Message_Generator_Parser_12.cpp +++ b/TAO/tao/GIOP_Message_Generator_Parser_12.cpp @@ -121,10 +121,12 @@ TAO_GIOP_Message_Generator_Parser_12::write_reply_header ( TAO_Pluggable_Reply_Params_Base &reply) { // Write the request ID - output.write_ulong (reply.request_id_); + if (!(output.write_ulong (reply.request_id_))) + return false; // Write the reply status - output.write_ulong (reply.reply_status ()); + if (!(output.write_ulong (reply.reply_status ()))) + return false; if (!(output << reply.service_context_notowned ())) return false; @@ -147,10 +149,12 @@ TAO_GIOP_Message_Generator_Parser_12::write_locate_reply_mesg ( CORBA::ULong request_id, TAO_GIOP_Locate_Status_Msg &status_info) { - output.write_ulong (request_id); + if (!(output.write_ulong (request_id))) + return false; // Make the header for the locate request - output.write_ulong (status_info.status); + if (!(output.write_ulong (status_info.status))) + return false; // Note: We dont align the pointer to an 8 byte boundary for a // locate reply body. This is due to an urgent issue raised by Michi @@ -177,7 +181,7 @@ TAO_GIOP_Message_Generator_Parser_12::write_locate_reply_mesg ( CORBA::Object_ptr object_ptr = status_info.forward_location_var.in (); - if ( ! (output << object_ptr)) + if (!(output << object_ptr)) { if (TAO_debug_level > 0) { diff --git a/TAO/tao/IIOP_Transport.cpp b/TAO/tao/IIOP_Transport.cpp index fb5912c5528..cf746946bdc 100644 --- a/TAO/tao/IIOP_Transport.cpp +++ b/TAO/tao/IIOP_Transport.cpp @@ -352,8 +352,8 @@ TAO_IIOP_Transport::set_bidir_context_info (TAO_Operation_Details &opdetails) TAO_OutputCDR cdr; // Marshal the information into the stream - if ((cdr << ACE_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER) == 0) - || (cdr << listen_point_list) == 0) + if (!(cdr << ACE_OutputCDR::from_boolean (TAO_ENCAP_BYTE_ORDER)) + || (!(cdr << listen_point_list))) return; // Add this info in to the svc_list |