Fix UB: don't dereference end iterators, they're out-of-bounds!

Author: stefanriemens

src/DSF/DSFPointPool.cpp

@@ -721,7 +721,7 @@ void DSFOptimizePrimitives(
 
 	vector<unsigned short> pure_tris;
 
-	unsigned short * s = &*indices.begin(), * e = &*indices.end();
+	unsigned short * s = indices.data(), * e = indices.data() + indices.size();
 	while(s != e)
 	{
 		unsigned short * b = strip_break(s,e);

src/GUI/GUI_Button.cpp

@@ -167,7 +167,7 @@ void		GUI_Button::Draw(GUI_GraphState * state)
 
 			if (!desc.empty())
 			{
-				w = GUI_MeasureRange(font_UI_Basic, &*desc.begin(), &*desc.end());
+				w = GUI_MeasureRange(font_UI_Basic, desc.data(), desc.data() + desc.size());
 				w = (bounds[2] - bounds[0] - w) / 2;
 				h = GUI_GetLineAscent(font_UI_Basic);
 				h = (bounds[3] - bounds[1] - h) / 2;

src/GUI/GUI_Fonts.cpp

@@ -476,7 +476,7 @@ void	GUI_TruncateText(
 {
 	if (ioText.empty()) return;
 
-	int chars = GUI_FitForward(inFontID, &*ioText.begin(), &*ioText.end(), inSpace);
+	int chars = GUI_FitForward(inFontID, ioText.data(),  ioText.data() + ioText.size(), inSpace);
 	if (chars == ioText.length()) return;
 	if (chars < 0) { ioText.clear(); return; }
 	if (chars > 2)

src/GUI/GUI_PopupButton.cpp

@@ -89,7 +89,7 @@ void		GUI_PopupButton::Draw(GUI_GraphState * state)
 	if (i >= 0 && i < mItems.size())
 	{
 		float c[4] = { 0,0,0,1 };
-		float w = GUI_MeasureRange(font_UI_Basic, &*mItems[i].begin(), &*mItems[i].end());
+		float w = GUI_MeasureRange(font_UI_Basic, mItems[i].data(), mItems[i].data() + mItems[i].size());
 		GUI_FontDraw(state,font_UI_Basic, c, (bounds[0]+bounds[2]-w) /2, bounds[1], mItems[i].c_str());
 	}
 }

src/GUI/GUI_TabControl.cpp

@@ -83,11 +83,11 @@ void		GUI_TabControl::SetDescriptor(const string& inDesc)
 		if(pos > 0 && pos < mItems[n].length())
 		{
 			int w1 = GUI_MeasureRange(font_UI_Basic, mItems[n].c_str(), mItems[n].c_str() + pos);
-			int w2 = GUI_MeasureRange(font_UI_Basic, mItems[n].c_str() + pos + 1,&* mItems[n].end() );
+			int w2 = GUI_MeasureRange(font_UI_Basic, mItems[n].c_str() + pos + 1, mItems[n].data() + mItems[n].size() );
 			mWidths[n] = max(w1, w2)  + TAB_PADDING * 2;
 		}
 		else
-			mWidths[n] = GUI_MeasureRange(font_UI_Basic, &*mItems[n].begin(), &*mItems[n].end()) + TAB_PADDING * 2;
+			mWidths[n] = GUI_MeasureRange(font_UI_Basic, &*mItems[n].begin(), mItems[n].data() + mItems[n].size()) + TAB_PADDING * 2;
 	}
 
 	SetMax(mItems.size());
@@ -137,7 +137,7 @@ void		GUI_TabControl::Draw(GUI_GraphState * state)
 			y += 0.5 * h;
 			GUI_FontDrawScaled(state, font_UI_Basic, mTextColor, x, y, 0, y+h, mItems[n].c_str(), mItems[n].c_str() + pos, align_Left);
 			y -= h;
-			GUI_FontDrawScaled(state, font_UI_Basic, mTextColor, x, y, 0, y+h, mItems[n].c_str() + pos + 1, &*mItems[n].end(), align_Left);
+			GUI_FontDrawScaled(state, font_UI_Basic, mTextColor, x, y, 0, y+h, mItems[n].c_str() + pos + 1, mItems[n].data() + mItems[n].size(), align_Left);
 		}
 		else
 			GUI_FontDraw(state, font_UI_Basic, mTextColor, x, y, mItems[n].c_str());

src/GUI/GUI_TextField.cpp

@@ -247,7 +247,7 @@ int			GUI_TextField::HandleCommand(int command)
 			if (GUI_GetTextFromClipboard(txt))
 			{
 				GetSelection(&s1, &s2);
-				DoReplaceText(s1, s2, &*txt.begin(), &*txt.end());
+				DoReplaceText(s1, s2, txt.data(), txt.data() + txt.size());
 				SetSelection(s1+txt.size(),s1+txt.size());
 			}
 		}
@@ -399,8 +399,8 @@ void			GUI_TextField::GetText(
 						const char **	end_p)
 {
 	GetDescriptor(mText);
-	*start_p = &*mText.begin();
-	*end_p = &*mText.end();
+	*start_p = mText.data();
+	*end_p = mText.data() + mText.size();
 }
 
 void			GUI_TextField::ReplaceText(

src/WEDImportExport/WED_GatewayImport.cpp

@@ -1056,7 +1056,7 @@ WED_Airport * WED_GatewayImportDialog::ImportSpecificVersion(const string& json_
 	vector<char> outString = vector<char>(zipString.length());
 
 	char * outP;
-	decode(&*zipString.begin(),&*zipString.end(),&*outString.begin(),&outP);
+	decode(zipString.data(),zipString.data() + zipString.size(), outString.data(), &outP);
 
 	//Fixes the terrible vector padding bug by shrinking it back down to precisely the correct size
 	outString.resize(outP - &*outString.begin());

src/WEDMap/WED_ToolInfoAdapter.cpp

@@ -336,12 +336,12 @@ int			WED_ToolInfoAdapter::GetCellWidth(int n)
 	case prop_TaxiSign:		return 150;
 //		mTool->GetNthPropertyDict(n / 2, dict);
 //		for(PropertyDict_t::iterator d = dict.begin(); d != dict.end(); ++d)
-//			w = max(w,(int) GUI_MeasureRange(OUR_FONT, &*d->second.begin(),&*d->second.end())+20);
+//			w = max(w,(int) GUI_MeasureRange(OUR_FONT, d->second.data(), d->second.data() + d->second.size())+20);
 //		return w;
 	default:				return 50;
 	}
 	else
-		return GUI_MeasureRange(OUR_FONT, &*inf.prop_name.begin(), &*inf.prop_name.end()) + 18;
+		return GUI_MeasureRange(OUR_FONT, inf.prop_name.data(), inf.prop_name.data() + inf.prop_name.size()) + 18;
 }
 
 int			WED_ToolInfoAdapter::GetCellBottom(int n)

src/XESCore/AptIO.cpp

@@ -143,7 +143,7 @@ static void	parse_linear_codes(const string& codes, set<int> * attributes)
 {
 	attributes->clear();
 	MFScanner scanner;
-	MFS_init(&scanner, &*codes.begin(), &*codes.end());
+	MFS_init(&scanner, codes.data(), codes.data() + codes.size());
 	int code;
 	while (!MFS_done(&scanner) && ((code = MFS_int(&scanner)) != 0))
 		attributes->insert(code);