Array indexing fix

IS4Code · Jul 5, 2018 · 3b39e1e · 3b39e1e
1 parent 30057a1
commit 3b39e1e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/plugins/src/main.cpp b/plugins/src/main.cpp
@@ -41,7 +41,7 @@ PLUGIN_EXPORT bool PLUGIN_CALL Load(void **ppData)
 		}
 	);
 
-	logprintf(" PawnPlus v0.7 loaded");
+	logprintf(" PawnPlus v0.7.1 loaded");
 	logprintf(" Created by IllidanS4");
 	return true;
 }
@@ -50,7 +50,7 @@ PLUGIN_EXPORT void PLUGIN_CALL Unload()
 {
 	Hooks::Unregister();
 
-	logprintf(" PawnPlus v0.7 unloaded");
+	logprintf(" PawnPlus v0.7.1 unloaded");
 }
 
 PLUGIN_EXPORT int PLUGIN_CALL AmxLoad(AMX *amx) 

diff --git a/plugins/src/objects/dyn_object.cpp b/plugins/src/objects/dyn_object.cpp
@@ -1,3 +1,4 @@
+#define _SCL_SECURE_NO_WARNINGS
 #include "dyn_object.h"
 #include "dyn_op.h"
 #include "../fixes/linux.h"
@@ -318,7 +319,7 @@ cell dyn_object::get_array(const cell *indices, cell num_indices, cell *arr, cel
 		block = array_data + 1;
 		cell data_begin = this->begin() - block, data_end = this->end() - block;
 		begin = 0;
-		end = rank > 2 ? block[0] / sizeof(cell) : data_end;
+		end = rank >= 2 ? block[0] / sizeof(cell) : data_end;
 		for(cell i = 0; i < num_indices; i++)
 		{
 			cell index = indices[i];
@@ -369,7 +370,7 @@ cell *dyn_object::get_cell_addr(const cell *indices, cell num_indices)
 
 	cell *block = array_data + 1;
 	cell data_begin = begin() - block, data_end = end() - block;
-	cell begin = 0, end = rank > 2 ? block[0] / sizeof(cell) : data_end;
+	cell begin = 0, end = rank >= 2 ? block[0] / sizeof(cell) : data_end;
 	for(cell i = 0; i < num_indices; i++)
 	{
 		cell index = indices[i];
@@ -409,7 +410,7 @@ const cell *dyn_object::get_cell_addr(const cell *indices, cell num_indices) con
 
 	const cell *block = array_data + 1;
 	cell data_begin = begin() - block, data_end = end() - block;
-	cell begin = 0, end = rank > 2 ? block[0] / sizeof(cell) : data_end;
+	cell begin = 0, end = rank >= 2 ? block[0] / sizeof(cell) : data_end;
 	for(cell i = 0; i < num_indices; i++)
 	{
 		cell index = indices[i];
@@ -532,7 +533,7 @@ cell dyn_object::get_size(const cell *indices, cell num_indices) const
 
 	const cell *block = array_data + 1;
 	cell data_begin = begin() - block, data_end = end() - block;
-	cell begin = 0, end = block[0] / sizeof(cell);
+	cell begin = 0, end = rank >= 2 ? block[0] / sizeof(cell) : data_end;
 	bool cells = false;
 	for(cell i = 0; i < num_indices; i++)
 	{