jberry 2002/12/16 11:40:43
Modified: c/src/xercesc/util/Transcoders/MacOSUnicodeConverter
MacOSUnicodeConverter.cpp
Log:
Bug fix: 14805; Mac OS transcoder should return pointer to zero length string
(rather than NULL) on receipt of zero length input
Revision Changes Path
1.9 +15 -1
xml-xerces/c/src/xercesc/util/Transcoders/MacOSUnicodeConverter/MacOSUnicodeConverter.cpp
Index: MacOSUnicodeConverter.cpp
===================================================================
RCS file:
/home/cvs/xml-xerces/c/src/xercesc/util/Transcoders/MacOSUnicodeConverter/MacOSUnicodeConverter.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- MacOSUnicodeConverter.cpp 14 Nov 2002 18:10:06 -0000 1.8
+++ MacOSUnicodeConverter.cpp 16 Dec 2002 19:40:43 -0000 1.9
@@ -1088,6 +1088,13 @@
if (status != noErr && status != kTECPartialCharErr)
result.reset();
+ else if (!result.get())
+ {
+ // No error, and no result: we probably processed a zero length
+ // input, in which case we want a valid zero length output.
+ result.reset(new char[1]);
+ result[0] = '\0';
+ }
return result.release();
}
@@ -1170,6 +1177,13 @@
if (status != noErr && status != kTECPartialCharErr)
result.reset();
+ else if (!result.get())
+ {
+ // No error, and no result: we probably processed a zero length
+ // input, in which case we want a valid zero length output.
+ result.reset(new XMLCh[1]);
+ result[0] = '\0';
+ }
return result.release();
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
