Merge pull request #2238 from erwincoumans/master

fix exceeding shared memory usage, return of member of deleted class.

examples/SharedMemory/SharedMemoryPublic.h

@@ -952,7 +952,7 @@ struct b3ForwardDynamicsAnalyticsIslandData
 	double m_remainingLeastSquaresResidual;
 };
 
-#define MAX_ISLANDS_ANALYTICS 1024
+#define MAX_ISLANDS_ANALYTICS 64
 
 struct b3ForwardDynamicsAnalyticsArgs
 {

examples/SharedMemory/plugins/grpcPlugin/grpcPlugin.cpp

@@ -206,7 +206,9 @@ private:
 			{
 				GPR_ASSERT(status_ == FINISH);
 				// Once in the FINISH state, deallocate ourselves (CallData).
+				CallData tmpStatus = status_;
 				delete this;
+				return tmpStatus;
 			}
 			return status_;
 		}