diff --git a/VERSION.TXT b/VERSION.TXT index 5453ef8..e4a20c8 100644 --- a/VERSION.TXT +++ b/VERSION.TXT @@ -1,5 +1,11 @@ NORM Version History +Version 1.1b9 +============= + - There have been a number of bug fixes since 1.1b3. This release + fixes a bug in NormBlockBuffer::Remove() and + NormObjectBuffer::Remove(). (Thanks Thava!) + Version 1.1b3 ============= - Started keeping version history. This release includes diff --git a/common/normObject.cpp b/common/normObject.cpp index 6267865..9357588 100644 --- a/common/normObject.cpp +++ b/common/normObject.cpp @@ -2524,7 +2524,7 @@ bool NormObjectTable::Remove(const NormObject* theObject) offset++; if ((entry = table[i])) { - NormObjectId id = (UINT16)index + offset; + NormObjectId id = (UINT16)objectId + offset; while(entry && (entry->GetId() != id)) { if ((entry->GetId() > objectId) && @@ -2560,7 +2560,7 @@ bool NormObjectTable::Remove(const NormObject* theObject) offset++; if ((entry = table[i])) { - NormObjectId id = (UINT16)index - offset; + NormObjectId id = (UINT16)objectId - offset; //printf("Looking for id:%lu at index:%lu\n", (UINT16)transport_id, i); while(entry && (entry->GetId() != id)) { diff --git a/common/normSegment.cpp b/common/normSegment.cpp index 85d49c7..a2ab0c6 100644 --- a/common/normSegment.cpp +++ b/common/normSegment.cpp @@ -856,7 +856,8 @@ bool NormBlockBuffer::Remove(const NormBlock* theBlock) offset++; if ((entry = table[i])) { - NormBlockId id = (UINT32)index + offset; + //NormBlockId id = (UINT32)index + offset; + NormBlockId id = (UINT32)blockId + offset; while(entry && (entry->GetId() != id)) { if ((entry->GetId() > blockId) && @@ -892,7 +893,8 @@ bool NormBlockBuffer::Remove(const NormBlock* theBlock) offset++; if ((entry = table[i])) { - NormBlockId id = (UINT32)index - offset; + //NormBlockId id = (UINT32)index - offset; + NormBlockId id = (UINT32)blockId - offset; //printf("Looking for id:%lu at index:%lu\n", (UINT32)id, i); while(entry && (entry->GetId() != id)) { diff --git a/common/normVersion.h b/common/normVersion.h index 90497e5..57e6ad6 100644 --- a/common/normVersion.h +++ b/common/normVersion.h @@ -32,6 +32,6 @@ #ifndef _NORM_VERSION #define _NORM_VERSION -#define VERSION "1.1b8" +#define VERSION "1.1b9" #endif // _NORM_VERSION