227497 - String conversion cleanup in nsLDAPChannel

Status: VERIFIED FIXED

(Directory :: LDAP XPCOM SDK, defect)

Description

[Johnny Stenback (:jst)]

I guess this code aint used by default, but still. Patch coming up...

Comment 1

[Johnny Stenback (:jst)]

Attachment: Cleanup...

The biggest problem here was that:

    rv = mReadPipeOut->Write(NS_ConvertUCS2toUTF8(entry).get(),
			     entryLength, &bytesWritten);

that code passed the length of the string in UTF16, but the data as UTF8, so
any time there were non-ASCII characters in that string, too few characters
would've been written out.

Comment 2

[Peter Van der Beken [:peterv]]

Comment on attachment 136815 [details] [diff] [review]
Cleanup...

>Index: directory/xpcom/base/src/nsLDAPChannel.cpp
>===================================================================

>@@ -941,48 +940,47 @@ nsLDAPChannel::OnLDAPSearchEntry(nsILDAP

>         // print all values of this attribute
>         //
>         for ( PRUint32 j=0 ; j < valueCount; j++ ) {
>-            AppendASCIItoUTF16(attrs[i], entry);
>-            entry.Append(NS_LITERAL_STRING(": "));
>-            entry.Append(vals[j]);
>-            entry.Append(NS_LITERAL_STRING("\n"));
>+            entry.Append(attrs[i]);
>+            entry.Append(": ");
>+            AppendUTF16toUTF8(vals[j], entry);
>+            entry.Append("\n");

Make that Append('\n');

>     // separate this entry from the next
>     //
>-    entry.Append(NS_LITERAL_STRING("\n"));
>+    entry.Append("\n");

Ditto.

Comment 3

[Stephen Donner [:stephend] Not actively reading bugmail]

Johnny, is this ready for checkin, or does it need to go by dmose?

Comment 4

[Johnny Stenback (:jst)]

Oh, sorry, this was checked in some time ago. Forgot to mark it fixed :-(

Comment 5

[Stephen Donner [:stephend] Not actively reading bugmail]

Indeed -

1.56	jst%mozilla.jstenback.com	2004-04-12 20:53	 	Fixing bug 227497. Cleaning up
some string usage in nsLDAPChannel. r+sr=[e-mail]

verified fixed.