Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-17 23:35:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1588260 part 1. Make some XSLT comparator code a bit more type-safe. r=peterv.

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D49051

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Boris Zbarsky 2019-11-11 18:03:34 +00:00
parent be7de717dd
commit f1a16e99d4
2 changed files with 39 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
dom/xslt/xslt/txXPathResultComparator.cpp
View File

@ -53,8 +53,8 @@ nsresult txResultStringComparator::createSortableValue(Expr* aExpr,
if (!mCollation) return NS_ERROR_FAILURE;
val->mCaseKey = new nsString;
nsString& nsCaseKey = *(nsString*)val->mCaseKey;
val->mCaseKeyString = new nsString;
nsString& nsCaseKey = *val->mCaseKeyString;
nsresult rv = aExpr->evaluateToString(aContext, nsCaseKey);
NS_ENSURE_SUCCESS(rv, rv);
@ -97,35 +97,23 @@ int txResultStringComparator::compareValues(txObject* aVal1, txObject* aVal2) {
if (result != 0) return ((mSorting & kAscending) ? 1 : -1) * result;
if ((strval1->mCaseLength == 0) && (strval1->mLength != 0)) {
nsString* caseString = (nsString*)strval1->mCaseKey;
rv = mCollation->AllocateRawSortKey(
nsICollation::kCollationCaseSensitive, *caseString,
(uint8_t**)&strval1->mCaseKey, &strval1->mCaseLength);
if ((strval1->mCaseKeyLength == 0) && (strval1->mLength != 0)) {
rv = strval1->initCaseKeyBuffer(mCollation);
if (NS_FAILED(rv)) {
// XXX ErrorReport
strval1->mCaseKey = caseString;
strval1->mCaseLength = 0;
return -1;
}
delete caseString;
}
if ((strval2->mCaseLength == 0) && (strval2->mLength != 0)) {
nsString* caseString = (nsString*)strval2->mCaseKey;
rv = mCollation->AllocateRawSortKey(
nsICollation::kCollationCaseSensitive, *caseString,
(uint8_t**)&strval2->mCaseKey, &strval2->mCaseLength);
if ((strval2->mCaseKeyLength == 0) && (strval2->mLength != 0)) {
rv = strval2->initCaseKeyBuffer(mCollation);
if (NS_FAILED(rv)) {
// XXX ErrorReport
strval2->mCaseKey = caseString;
strval2->mCaseLength = 0;
return -1;
}
delete caseString;
}
rv = mCollation->CompareRawSortKey(
(uint8_t*)strval1->mCaseKey, strval1->mCaseLength,
(uint8_t*)strval2->mCaseKey, strval2->mCaseLength, &result);
strval1->mCaseKeyBuffer, strval1->mCaseKeyLength, strval2->mCaseKeyBuffer,
strval2->mCaseKeyLength, &result);
if (NS_FAILED(rv)) {
// XXX ErrorReport
return -1;
@ -136,14 +124,31 @@ int txResultStringComparator::compareValues(txObject* aVal1, txObject* aVal2) {
}
txResultStringComparator::StringValue::StringValue()
: mKey(0), mCaseKey(0), mLength(0), mCaseLength(0) {}
: mKey(0), mCaseKeyString(nullptr), mLength(0), mCaseKeyLength(0) {}
txResultStringComparator::StringValue::~StringValue() {
free(mKey);
if (mCaseLength > 0)
free(mCaseKey);
if (mCaseKeyLength > 0)
free(mCaseKeyBuffer);
else
delete (nsString*)mCaseKey;
delete mCaseKeyString;
}
nsresult txResultStringComparator::StringValue::initCaseKeyBuffer(
nsICollation* aCollation) {
nsString* caseString = mCaseKeyString;
mCaseKeyString = nullptr;
nsresult rv = aCollation->AllocateRawSortKey(
nsICollation::kCollationCaseSensitive, *caseString, &mCaseKeyBuffer,
&mCaseKeyLength);
if (NS_FAILED(rv)) {
mCaseKeyString = caseString;
mCaseKeyLength = 0;
return rv;
}
delete caseString;
return NS_OK;
}
txResultNumberComparator::txResultNumberComparator(bool aAscending) {

12
dom/xslt/xslt/txXPathResultComparator.h
View File

@ -59,9 +59,17 @@ class txResultStringComparator : public txXPathResultComparator {
StringValue();
~StringValue();
nsresult initCaseKeyBuffer(nsICollation* aCollation);
uint8_t* mKey;
void* mCaseKey;
uint32_t mLength, mCaseLength;
union {
nsString* mCaseKeyString;
uint8_t* mCaseKeyBuffer;
};
// When mCaseKeyLength is nonzero, we have an mCaseKeyBuffer, which needs to
// be freed with free(). Otherwise we have an mCaseKeyString, which needs
// to have operator delete called on it.
uint32_t mLength, mCaseKeyLength;
};
};