past-the-end check

gframe/deck_con.cpp

@@ -336,6 +336,8 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
 			dragx = event.MouseInput.X;
 			dragy = event.MouseInput.Y;
 			draging_pointer = dataManager.GetCodePointer(hovered_code);
+			if(draging_pointer == dataManager._datas.end())
+				break;
 			unsigned int limitcode = draging_pointer->second.alias ? draging_pointer->second.alias : draging_pointer->first;
 			if(hovered_pos == 4) {
 				int limit = 3;
@@ -438,6 +440,8 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
 				if(hovered_pos == 0 || hovered_seq == -1)
 					break;
 				draging_pointer = dataManager.GetCodePointer(hovered_code);
+				if(draging_pointer == dataManager._datas.end())
+					break;
 				if(hovered_pos == 1) {
 					if(deckManager.current_deck.side.size() < 20) {
 						deckManager.current_deck.main.erase(deckManager.current_deck.main.begin() + hovered_seq);
@@ -464,8 +468,11 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
 				break;
 			if(hovered_pos == 0 || hovered_seq == -1)
 				break;
-			if(!is_draging)
+			if(!is_draging) {
 				draging_pointer = dataManager.GetCodePointer(hovered_code);
+				if(draging_pointer == dataManager._datas.end())
+					break;
+			}
 			if(hovered_pos == 1) {
 				if(!is_draging)
 					deckManager.current_deck.main.erase(deckManager.current_deck.main.begin() + hovered_seq);
@@ -643,7 +650,7 @@ void DeckBuilder::FilterCards() {
 	const wchar_t* pstr = mainGame->ebCardName->getText();
 	int trycode = BufferIO::GetVal(pstr);
 	if(dataManager.GetData(trycode, 0)) {
-		auto ptr = dataManager.GetCodePointer(trycode);
+		auto ptr = dataManager.GetCodePointer(trycode);	// verified by GetData()
 		results.push_back(ptr);
 		mainGame->scrFilter->setVisible(false);
 		mainGame->scrFilter->setPos(0);

gframe/deck_manager.cpp

@@ -128,7 +128,7 @@ void DeckManager::LoadDeck(Deck& deck, int* dbuf, int mainc, int sidec) {
 		if(cd.type & TYPE_TOKEN)
 			continue;
 		else if(cd.type & 0x802040 && deck.extra.size() < 15) {
-			deck.extra.push_back(dataManager.GetCodePointer(code));
+			deck.extra.push_back(dataManager.GetCodePointer(code));	//verified by GetData()
 		} else if(deck.main.size() < 60) {
 			deck.main.push_back(dataManager.GetCodePointer(code));
 		}
@@ -140,7 +140,7 @@ void DeckManager::LoadDeck(Deck& deck, int* dbuf, int mainc, int sidec) {
 		if(cd.type & TYPE_TOKEN)
 			continue;
 		if(deck.side.size() < 15)
-			deck.side.push_back(dataManager.GetCodePointer(code));
+			deck.side.push_back(dataManager.GetCodePointer(code));	//verified by GetData()
 	}
 }
 bool DeckManager::LoadSide(Deck& deck, int* dbuf, int mainc, int sidec) {

gframe/event_handler.cpp

@@ -804,7 +804,8 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
 				ancard.clear();
 				for(auto cit = dataManager._strings.begin(); cit != dataManager._strings.end(); ++cit) {
 					if(wcsstr(cit->second.name, pname) != 0) {
-						auto cp = dataManager.GetCodePointer(cit->first);
+						auto cp = dataManager.GetCodePointer(cit->first);	//verified by _strings
+						//datas.alias can be double card names or alias
 						if(cp->second.code == 78734254 || cp->second.code == 13857930 
 								|| !cp->second.alias && !((cp->second.type & (TYPE_MONSTER + TYPE_TOKEN)) == (TYPE_MONSTER + TYPE_TOKEN))) {
 							mainGame->lstANCard->addItem(cit->second.name);
@@ -838,7 +839,8 @@ bool ClientField::OnEvent(const irr::SEvent& event) {
 				ancard.clear();
 				for(auto cit = dataManager._strings.begin(); cit != dataManager._strings.end(); ++cit) {
 					if(wcsstr(cit->second.name, pname) != 0) {
-						auto cp = dataManager.GetCodePointer(cit->first);
+						auto cp = dataManager.GetCodePointer(cit->first);	//verified by _strings
+						//datas.alias can be double card names or alias
 						if(cp->second.code == 78734254 || cp->second.code == 13857930 
 								|| !cp->second.alias && !((cp->second.type & (TYPE_MONSTER + TYPE_TOKEN)) == (TYPE_MONSTER + TYPE_TOKEN))) {
 							mainGame->lstANCard->addItem(cit->second.name);

ocgcore @ c96a5669

-Subproject commit 51693962c2b33886cd376090c9eee1fd7ddba3df
+Subproject commit c96a56694a4f51f6ec5e0b85442b6026a9739c2d

script @ ecc9ccf1

-Subproject commit 8f7a3931de9af806cdf45219bd211a65ad77e8fd
+Subproject commit ecc9ccf118b4d8caab700445a8912d8ba0911bba