summaryrefslogtreecommitdiff
path: root/ace/CDR_Stream.i
diff options
context:
space:
mode:
authorcoryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2000-03-21 20:04:57 +0000
committercoryan <coryan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2000-03-21 20:04:57 +0000
commitf944cd23af83d2d1782aa1995859915f358314ea (patch)
tree0bc9e51d84681d60d8063bc3ab5cff2fa21921a7 /ace/CDR_Stream.i
parentf797fcd6004cc2a8b595c4b1ba2ac6482d1fdeb8 (diff)
downloadATCD-f944cd23af83d2d1782aa1995859915f358314ea.tar.gz
ChangeLogTag:Tue Mar 21 10:37:17 2000 Carlos O'Ryan <coryan@cs.wustl.edu>
Diffstat (limited to 'ace/CDR_Stream.i')
-rw-r--r--ace/CDR_Stream.i8
1 files changed, 6 insertions, 2 deletions
diff --git a/ace/CDR_Stream.i b/ace/CDR_Stream.i
index 611d147df0e..39d588cb892 100644
--- a/ace/CDR_Stream.i
+++ b/ace/CDR_Stream.i
@@ -1083,7 +1083,9 @@ operator<< (ACE_OutputCDR &os, ACE_OutputCDR::from_octet x)
ACE_INLINE ACE_CDR::Boolean
operator<< (ACE_OutputCDR &os, ACE_OutputCDR::from_string x)
{
- ACE_CDR::ULong len = ACE_OS::strlen (x.val_);
+ ACE_CDR::ULong len = 0;
+ if (x.val_ != 0)
+ len = ACE_OS::strlen (x.val_);
os.write_string (len, x.val_);
return os.good_bit () && (len <= x.bound_);
}
@@ -1091,7 +1093,9 @@ operator<< (ACE_OutputCDR &os, ACE_OutputCDR::from_string x)
ACE_INLINE ACE_CDR::Boolean
operator<< (ACE_OutputCDR &os, ACE_OutputCDR::from_wstring x)
{
- ACE_CDR::ULong len = ACE_OS::wslen (x.val_);
+ ACE_CDR::ULong len;
+ if (x.val_ != 0)
+ len = ACE_OS::wslen (x.val_);
os.write_wstring (len, x.val_);
return os.good_bit () && (len <= x.bound_);
}