Merge pull request #725 from openmultiplayer/amir/changes

more queryExtension return value checks, update cmake-conan
openmultiplayer · Sep 22, 2023 · e0253dc · e0253dc
2 parents 749dd5a + a696381
commit e0253dc
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 5 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -274,7 +274,8 @@ jobs:
         cpu: cortex-a7
         commands: |
             apt update && apt install -y ninja-build clang-11 python3-pip libstdc++6 libc6
-            pip3 install --user -v "conan==1.57.0"
+            pip install --upgrade pip setuptools wheel
+            pip3 install --user -v "conan==1.59.0"
             pip3 install --user -v "cmake==3.23.3"
             export CC=/usr/bin/clang-11
             export CXX=/usr/bin/clang++-11

diff --git a/SDK/lib/cmake-conan b/SDK/lib/cmake-conan
diff --git a/Server/Components/Pawn/Scripting/TextLabel/Natives.cpp b/Server/Components/Pawn/Scripting/TextLabel/Natives.cpp
@@ -152,7 +152,12 @@ SCRIPT_API_FAILRET(CreatePlayer3DTextLabel, INVALID_TEXT_LABEL_ID, int(IPlayer&
 
 SCRIPT_API(DeletePlayer3DTextLabel, bool(IPlayer& player, IPlayerTextLabel& textlabel))
 {
-	queryExtension<IPlayerTextLabelData>(player)->release(textlabel.getID());
+	auto data = queryExtension<IPlayerTextLabelData>(player);
+	if (!data)
+	{
+		return false;
+	}
+	data->release(textlabel.getID());
 	return true;
 }
 

diff --git a/Server/Components/Pickups/pickups_main.cpp b/Server/Components/Pickups/pickups_main.cpp
@@ -120,7 +120,13 @@ class PickupsComponent final : public IPickupsComponent, public PlayerConnectEve
 			{
 				return false;
 			}
+
 			auto data = queryExtension<IPlayerPickupData>(peer);
+			if (!data)
+			{
+				return false;
+			}
+
 			int id = data->fromClientID(onPlayerPickUpPickupRPC.PickupID);
 			if (!id)
 			{

diff --git a/Server/Components/Vehicles/vehicle.cpp b/Server/Components/Vehicles/vehicle.cpp
@@ -322,6 +322,11 @@ bool Vehicle::updateFromTrailerSync(const VehicleTrailerSyncPacket& trailerSync,
 	updateOccupied();
 
 	PlayerVehicleData* playerData = queryExtension<PlayerVehicleData>(player);
+	if (!playerData)
+	{
+		return false;
+	}
+
 	Vehicle* vehicle = static_cast<Vehicle*>(playerData->getVehicle());
 
 	if (!vehicle || vehicle->detaching)
@@ -369,6 +374,10 @@ bool Vehicle::updateFromTrailerSync(const VehicleTrailerSyncPacket& trailerSync,
 bool Vehicle::updateFromPassengerSync(const VehiclePassengerSyncPacket& passengerSync, IPlayer& player)
 {
 	PlayerVehicleData* data = queryExtension<PlayerVehicleData>(player);
+	if (!data)
+	{
+		return false;
+	}
 	// Only do heavy processing if switching vehicle or switching between driver and passenger
 	int passengerSeats = Impl::getVehiclePassengerSeats(getModel());
 	// TODO: Deal with two players in the same seat.

diff --git a/Server/Components/Vehicles/vehicles_impl.hpp b/Server/Components/Vehicles/vehicles_impl.hpp
@@ -91,7 +91,7 @@ class VehiclesComponent final : public IVehiclesComponent, public CoreEventHandl
 			}
 
 			IPlayerVehicleData* vehData = queryExtension<IPlayerVehicleData>(peer);
-			if (!lock.entry->isStreamedInForPlayer(peer) || !(peer.getState() == PlayerState_Driver || peer.getState() == PlayerState_Passenger) || vehData->getVehicle() != lock.entry)
+			if (vehData == nullptr || !lock.entry->isStreamedInForPlayer(peer) || !(peer.getState() == PlayerState_Driver || peer.getState() == PlayerState_Passenger) || vehData->getVehicle() != lock.entry)
 			{
 				return false;
 			}
@@ -126,6 +126,11 @@ class VehiclesComponent final : public IVehiclesComponent, public CoreEventHandl
 			}
 
 			PlayerVehicleData* data = queryExtension<PlayerVehicleData>(peer);
+			if (!data)
+			{
+				return false;
+			}
+
 			IVehicle* vehicle = data->getVehicle();
 			if (vehicle && vehicle->getDriver() == &peer)
 			{

diff --git a/Server/Source/player_pool.hpp b/Server/Source/player_pool.hpp
@@ -1494,7 +1494,7 @@ struct PlayerPool final : public IPlayerPool, public NetworkEventHandler, public
 			Player& player = static_cast<Player&>(peer);
 			PlayerState state = player.getState();
 			IPlayerVehicleData* vehData = queryExtension<IPlayerVehicleData>(peer);
-			if (state != PlayerState_Driver || vehData->getVehicle() == nullptr)
+			if (state != PlayerState_Driver || vehData == nullptr || vehData->getVehicle() == nullptr)
 			{
 				return false;
 			}
+2 −2		CMakeLists.txt
+28 −11		README.md
+2 −2		conan-omp.cmake
+152 −15		conan.cmake
+86 −35		tests.py