diff options
| author | erwincoumans <erwincoumans@google.com> | 2019-05-06 17:15:13 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-06 17:15:13 -0700 |
| commit | 9f28a27323ca4cc677d66ac4a38dcf1507529cbc (patch) | |
| tree | 7917cfc5b7ea1615eb908fc80e8ea8fc546d304a | |
| parent | b40bb583b74c8e1edf8563e9ebbf57fb94016c3e (diff) | |
| parent | 688df2c60bb7d2d3ab9dfcacfd3fa663d6acb8c9 (diff) | |
| download | bullet3-9f28a27323ca4cc677d66ac4a38dcf1507529cbc.tar.gz | |
Merge pull request #2238 from erwincoumans/master
fix exceeding shared memory usage, return of member of deleted class.
| -rw-r--r-- | examples/SharedMemory/SharedMemoryPublic.h | 2 | ||||
| -rw-r--r-- | examples/SharedMemory/plugins/grpcPlugin/grpcPlugin.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/examples/SharedMemory/SharedMemoryPublic.h b/examples/SharedMemory/SharedMemoryPublic.h index b2c2f6c68..6c62c788e 100644 --- a/examples/SharedMemory/SharedMemoryPublic.h +++ b/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 { diff --git a/examples/SharedMemory/plugins/grpcPlugin/grpcPlugin.cpp b/examples/SharedMemory/plugins/grpcPlugin/grpcPlugin.cpp index eb6c04d9f..7a0d4888a 100644 --- a/examples/SharedMemory/plugins/grpcPlugin/grpcPlugin.cpp +++ b/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_; } |