Merge pull request #17843 from yashykt/17819fix

Add alignment to size calculation
6 years ago · 8ed3cd422f
parent b52570c7c3 6cdbd8a49a
commit 8ed3cd422f
1 changed files with 3 additions and 2 deletions
--- a/src/core/ext/filters/client_channel/subchannel.cc
+++ b/src/core/ext/filters/client_channel/subchannel.cc
@ -1004,8 +1004,9 @@ grpc_subchannel_get_connected_subchannel(grpc_subchannel* c) {
 void* grpc_connected_subchannel_call_get_parent_data(
    grpc_subchannel_call* subchannel_call) {
  grpc_channel_stack* chanstk = subchannel_call->connection->channel_stack();
-  return (char*)subchannel_call + sizeof(grpc_subchannel_call) +
-         chanstk->call_stack_size;
+  return (char*)subchannel_call +
+         GPR_ROUND_UP_TO_ALIGNMENT_SIZE(sizeof(grpc_subchannel_call)) +
+         GPR_ROUND_UP_TO_ALIGNMENT_SIZE(chanstk->call_stack_size);
 }

 grpc_call_stack* grpc_subchannel_call_get_call_stack(