fix off-by-1 crash bug in sidebar as per electronicarts#105

ChthonVII · Jun 23, 2021 · 9ff76b8 · 9ff76b8
1 parent df34288
commit 9ff76b8
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 7 deletions.
diff --git a/REDALERT/SIDEBAR.CPP b/REDALERT/SIDEBAR.CPP
@@ -1408,7 +1408,8 @@ void SidebarClass::StripClass::Deactivate(void)
  *=============================================================================================*/
 bool SidebarClass::StripClass::Add(RTTIType type, int id, bool via_capture)
 {
-	if (BuildableCount <= MAX_BUILDABLES) {
+    // Chthon CFE Note: bugfix as per https://github.com/electronicarts/CnC_Remastered_Collection/issues/105
+	if (BuildableCount < MAX_BUILDABLES) {
 		for (int index = 0; index < BuildableCount; index++) {
 			if (Buildables[index].BuildableType == type && Buildables[index].BuildableID == id) {
 				return(false);
@@ -2475,4 +2476,4 @@ void SidebarClass::Zoom_Mode_Control(void)
 		}
 	}
 #endif
-}
+}
diff --git a/REDALERT/SIDEBARGlyphx.CPP b/REDALERT/SIDEBARGlyphx.CPP
@@ -358,7 +358,8 @@ void SidebarGlyphxClass::StripClass::Init_Clear(void)
  *=============================================================================================*/
 bool SidebarGlyphxClass::StripClass::Add(RTTIType type, int id, bool via_capture)
 {
-	if (BuildableCount <= MAX_BUILDABLES) {
+	// Chthon CFE Note: bugfix as per https://github.com/electronicarts/CnC_Remastered_Collection/issues/105
+    if (BuildableCount < MAX_BUILDABLES) {
 		for (int index = 0; index < BuildableCount; index++) {
 			if (Buildables[index].BuildableType == type && Buildables[index].BuildableID == id) {
 				return(false);
@@ -818,4 +819,4 @@ void Sidebar_Glyphx_Decode_Pointers(SidebarGlyphxClass *sidebar)
 	if (sidebar) {
 		sidebar->Decode_Pointers();
 	}
-}
+}
diff --git a/TIBERIANDAWN/SIDEBAR.CPP b/TIBERIANDAWN/SIDEBAR.CPP
@@ -1437,7 +1437,8 @@ static int sortfunc(void const * ptr1, void const * ptr2)
  *=============================================================================================*/
 bool SidebarClass::StripClass::Add(RTTIType type, int id, bool via_capture)
 {
-	if (BuildableCount <= MAX_BUILDABLES) {
+	// Chthon CFE Note: bugfix as per https://github.com/electronicarts/CnC_Remastered_Collection/issues/105
+    if (BuildableCount < MAX_BUILDABLES) {
 		for (int index = 0; index < BuildableCount; index++) {
 			if (Buildables[index].BuildableType == type && Buildables[index].BuildableID == id) {
 				return(false);

diff --git a/TIBERIANDAWN/SIDEBARGlyphx.CPP b/TIBERIANDAWN/SIDEBARGlyphx.CPP
@@ -359,7 +359,8 @@ void SidebarGlyphxClass::StripClass::Init_Clear(void)
  *=============================================================================================*/
 bool SidebarGlyphxClass::StripClass::Add(RTTIType type, int id, bool via_capture)
 {
-	if (BuildableCount <= MAX_BUILDABLES) {
+    // Chthon CFE Note: bugfix as per https://github.com/electronicarts/CnC_Remastered_Collection/issues/105
+	if (BuildableCount < MAX_BUILDABLES) {
 		for (int index = 0; index < BuildableCount; index++) {
 			if (Buildables[index].BuildableType == type && Buildables[index].BuildableID == id) {
 				return(false);
@@ -830,4 +831,4 @@ void Sidebar_Glyphx_Decode_Pointers(SidebarGlyphxClass *sidebar)
 		sidebar->Decode_Pointers();
 	}
 }
-
+