From 01499e051e3c55410ba09b39b9e6431de43f53b7 Mon Sep 17 00:00:00 2001
From: Muxi Yan <mxyan@google.com>
Date: Fri, 7 Apr 2017 09:48:03 -0700
Subject: [PATCH] Revert "Fix a bug in slice_buffer:maybe_embiggen"
This reverts commit 9a0356b1e6d0f4fdd1e29a48596b91458b038f46.
---
src/core/lib/slice/slice_buffer.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/core/lib/slice/slice_buffer.c b/src/core/lib/slice/slice_buffer.c
index 451319c50d..9176dc8a42 100644
--- a/src/core/lib/slice/slice_buffer.c
+++ b/src/core/lib/slice/slice_buffer.c
@@ -46,6 +46,11 @@
#define GROW(x) (3 * (x) / 2)
static void maybe_embiggen(grpc_slice_buffer *sb) {
+ if (sb->base_slices != sb->slices) {
+ memmove(sb->base_slices, sb->slices, sb->count * sizeof(grpc_slice));
+ sb->slices = sb->base_slices;
+ }
+
/* How far away from sb->base_slices is sb->slices pointer */
size_t slice_offset = (size_t)(sb->slices - sb->base_slices);
size_t slice_count = sb->count + slice_offset;
@@ -56,15 +61,12 @@ static void maybe_embiggen(grpc_slice_buffer *sb) {
if (sb->base_slices == sb->inlined) {
sb->base_slices = gpr_malloc(sb->capacity * sizeof(grpc_slice));
memcpy(sb->base_slices, sb->inlined, slice_count * sizeof(grpc_slice));
- sb->slices = sb->base_slices + slice_offset;
} else {
- if (sb->base_slices != sb->slices) {
- memmove(sb->base_slices, sb->slices, sb->count * sizeof(grpc_slice));
- }
sb->base_slices =
gpr_realloc(sb->base_slices, sb->capacity * sizeof(grpc_slice));
- sb->slices = sb->base_slices;
}
+
+ sb->slices = sb->base_slices + slice_offset;
}
}
--
GitLab