269254 - Bug in utf16ToUcs4()

Status: RESOLVED FIXED

(Core :: Networking, defect)

Description

[Mats Palmgren (inactive)]

Followup from bug 250900 comment 16:

When utf16ToUcs4() in netwerk/dns/src/nsIDNService.cpp
truncates the result it returns a 'outLen' that is 1 too much.

The suggested patch in bug 250900 comment 16 still works (attachment 153220 [details] [diff] [review]).

Comment 1

[Ryan Jones-Ward [:sciguyryan]]

Attachment: Patch v1

Patch v1.

* The null terminating character is set at |out[outBufLen-1]| so the length of the string will be one greater, set |outLen| too |outBufLen|.

Comment 2

[:Gavin Sharp [email: [e-mail]]]

mozilla/netwerk/dns/src/nsIDNService.cpp 	1.30

Comment 3

[jag (Peter Annema)]

This patch doesn't seem right. With |*outLen = outBufLen;| you include the null terminator in the string's length. The non-error path of the function doesn't. The simple fix is to make it |*outLen = outBufLen - 1;|, or do what the patch Mats referred to did and set i to outBufLen - 1 and break to fall through to the non-error code path to set the null terminator and *outLen.

Comment 4

[David Baron :dbaron: (⌚️UTC-4, no longer working on Mozilla)]

I was just going to make the same comment that jag made -- looks like this should be outBufLen-1.

Comment 5

[Ryan Jones-Ward [:sciguyryan]]

Attachment: Patch v2

Patch v2

* Updated too comments (corrected). Thanks for the comments everyone!

Comment 6

[Christian :Biesinger (don't email me, ping me on IRC)]

Comment on attachment 248922 [details] [diff] [review]
Patch v2

sorry for not noticing that :/

Comment 7

[Ryan Jones-Ward [:sciguyryan]]

(In reply to comment #6)
> (From update of attachment 248922 [details] [diff] [review] [edit])
> sorry for not noticing that :/
> 

My fault really, I should have noticed that too - sorry for the waste of time!

Comment 8

[:Gavin Sharp [email: [e-mail]]]

Followup checked in.
mozilla/netwerk/dns/src/nsIDNService.cpp 	1.32