Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2238 from erwincoumans/master

Browse Source 
fix exceeding shared memory usage, return of member of deleted class.
This commit is contained in:
erwincoumans
2019-05-06 17:15:13 -07:00
committed by GitHub
parent b40bb583b7 688df2c60b
commit 9f28a27323
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/SharedMemory/SharedMemoryPublic.h
View File

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

2
examples/SharedMemory/plugins/grpcPlugin/grpcPlugin.cpp
View File

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