[ZH] Check vector size before accessing first element in World Builder MapObjectProps and ScorchOptions

[Caball009]

Reproduction steps: Start World Builder (debug build) and tick "Enabled" in the "Object Properties" window. This will result in a debug assertion: "front() called on empty vector".

Notice how a pointer to the first element of m_allSelectedDicts is taken without checking whether the vector is empty or not (line 1436):

GeneralsGameCode/GeneralsMD/Code/Tools/WorldBuilder/src/mapobjectprops.cpp

Lines 1418 to 1441 in 51afe0c

	/// Move data from dialog controls to object
	void MapObjectProps::_SelectableToDict(void)
	{
	getAllSelectedDicts();
	CButton *owner = (CButton*) GetDlgItem(IDC_MAPOBJECT_Selectable);
	Bool isChecked = (owner->GetCheck() == 1);
	Bool isTristate = (owner->GetCheck() == 2);
	CWorldBuilderDoc* pDoc = CWorldBuilderDoc::GetActiveDoc();
	if ( pDoc != NULL )
	{
	Dict newDict;
	if (isTristate) {
	newDict.remove(TheKey_objectSelectable);
	} else {
	newDict.setBool(TheKey_objectSelectable, isChecked);
	}
	DictItemUndoable *pUndo = new DictItemUndoable(&m_allSelectedDicts.front(), newDict, newDict.getNthKey(0), m_allSelectedDicts.size());
	pDoc->AddAndDoUndoable(pUndo);
	REF_PTR_RELEASE(pUndo); // belongs to pDoc now.
	// Update is called by Do
	}
	}

I chose to not add size checks everywhere but keep the code functionally the same except calling front() on an empty vector. As long as the vector is empty, the code in DictItemUndoable::DictItemUndoable won't attempt to dereference the front pointer so it can be NULL.

Would need to be replicated in Generals.

TODO

• Replicate in Generals

[xezon]

Please fix function name and body.

Dict** ScorchOptions::getAllSelectedDictsData()
{
#if defined(USING_STLPORT) || __cplusplus < 201103L
  return !m_allSelectedDicts.empty() ? &m_allSelectedDicts.front() : NULL;
#else
  return m_allSelectedDicts.data();
#endif
}

[Caball009]

Changed and ported to Generals.

[xezon]

Looks good.

[xezon]

Is this code placed at a consistent location with Generals?