Security-163.tar.gz

[apple/security.git] / cdsa / cdsa_utilities / DbIndex.cpp

diff --git a/cdsa/cdsa_utilities/DbIndex.cpp b/cdsa/cdsa_utilities/DbIndex.cpp
index 0b2a5edcfd86671aa21b40c8d879f122148d647f..03359f620eb360c8a2070d5afdd510e660ac0b7a 100644 (file)
--- a/cdsa/cdsa_utilities/DbIndex.cpp
+++ b/cdsa/cdsa_utilities/DbIndex.cpp
@@ -149,11 +149,11 @@ DbConstIndex::DbConstIndex(const Table &table, const ReadSection &indexSection)
        uint32 numRecords = indexSection.at(offset);
        offset += AtomSize;
        mKeyOffsetVector.overlay(numRecords,
        uint32 numRecords = indexSection.at(offset);
        offset += AtomSize;
        mKeyOffsetVector.overlay(numRecords,

-               reinterpret_cast<const uint32 *>(indexSection.range(Range(offset, numRecords * AtomSize))));
+               reinterpret_cast<const Atom *>(indexSection.range(Range(offset, numRecords * AtomSize))));

 
        offset += numRecords * AtomSize;
        mRecordNumberVector.overlay(numRecords,
 
        offset += numRecords * AtomSize;
        mRecordNumberVector.overlay(numRecords,

-               reinterpret_cast<const uint32 *>(indexSection.range(Range(offset, numRecords * AtomSize))));
+               reinterpret_cast<const Atom *>(indexSection.range(Range(offset, numRecords * AtomSize))));

 }
 
 // Check to see if this index can be used to perform a given query, based on
 }
 
 // Check to see if this index can be used to perform a given query, based on


@@ -413,7 +413,7 @@ DbMutableIndex::insertRecordMulti(uint32 recordNumber, const ReadSection &packed
                uint32 newKeySize = keySize;
                metaAttribute.copyValueBytes(i, packedRecord, keyData, newKeySize);
                
                uint32 newKeySize = keySize;
                metaAttribute.copyValueBytes(i, packedRecord, keyData, newKeySize);
                

-               if (attributeIndex == mAttributes.size()) {
+               if (attributeIndex + 1 == mAttributes.size()) {

                        uint32 offset = mIndexDataSize;
                        mIndexDataSize = mIndexData.put(mIndexDataSize, newKeySize, keyData.address());
                        mIndexData.size(mIndexDataSize);
                        uint32 offset = mIndexDataSize;
                        mIndexDataSize = mIndexData.put(mIndexDataSize, newKeySize, keyData.address());
                        mIndexData.size(mIndexDataSize);