812407 - nssutil_escapeQuotes adds 2 to the allocation size redundantly

Status: RESOLVED FIXED

(NSS :: Libraries, defect, P2)

Description

[Wan-Teh Chang]

Attachment: Patch

The function nssutil_escapeQuotes was added in the patch for bug 753116.

nssutil_escapeQuotes calls nssutil_escapeQuotesSize to calculate the allocation
size, but then it adds 2 to the allocation size. The 2 is apparently for the
addquotes=PR_TRUE case, but nssutil_escapeQuotesSize already adds 2 to the
allocation size in that case.

Comment 1

[Wan-Teh Chang]

This shows nssutil_escapeQuotesSize already adds 2 to the allocation size
if addquotes is PR_TRUE, so nssutil_escapeQuotes does not need to add 2
again:

http://bonsai.mozilla.org/cvsblame.cgi?file=mozilla/security/nss/lib/util/utilpars.c&rev=1.3&mark=318,323,333,340,342#313

Looking at this more closely, I suspect the 2 may have been added to
compensate for bug 785208.

Comment 2

[Robert Relyea]

Comment on attachment 682303 [details] [diff] [review]
Patch

r+ I think so. Also it's an alloc, so it's safer to allocate more than less (I've been known to add fudge factors into allocates just so I don't get bit by off by one errors).

bob

Comment 3

[Wan-Teh Chang]

Patch checked in on the NSS trunk (NSS 3.14.1).

Checking in utilpars.c;
/cvsroot/mozilla/security/nss/lib/util/utilpars.c,v  <--  utilpars.c
new revision: 1.5; previous revision: 1.4
done