diff options
| author |  Craig Tiller <craig.tiller@gmail.com> | 2015-07-05 21:08:33 -0700 |
|---|---|---|
| committer | Craig Tiller <craig.tiller@gmail.com> | 2015-07-05 21:08:33 -0700 |
| commit | 27166a6f65581a9ee820882e5d7506d6bd07ade6 (patch) | |
| tree | 0e89c5e09a955b2a074a8b34e0f3fe0a4135f346 /src/core/security/secure_transport_setup.c | |
| parent | 4efb6966bdfb62c725c6614b0d85ea374250bb51 (diff) | |
| parent | d1dd3a68a2d4af56f1409327c197590dac6968cb (diff) | |
Merge github.com:grpc/grpc into flow-like-lava-to-a-barnyard
Conflicts:
src/core/surface/call.c
src/core/transport/chttp2_transport.c
src/core/transport/transport.h
Diffstat (limited to 'src/core/security/secure_transport_setup.c')
| -rw-r--r-- | src/core/security/secure_transport_setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/security/secure_transport_setup.c b/src/core/security/secure_transport_setup.c index 3e1db9a12d..1b39ab141e 100644 --- a/src/core/security/secure_transport_setup.c +++ b/src/core/security/secure_transport_setup.c @@ -235,7 +235,7 @@ static void on_handshake_data_received_from_peer( gpr_slice_unref(slices[i]); /* split_tail above increments refcount. */ } gpr_slice_buffer_addn(&s->left_overs, &slices[i + 1], - num_left_overs - has_left_overs_in_current_slice); + num_left_overs - (size_t)has_left_overs_in_current_slice); check_peer(s); } |