1 files changed, 2 insertions, 1 deletions
diff --git a/src/google/protobuf/io/coded_stream_inl.h b/src/google/protobuf/io/coded_stream_inl.h
index 144f44f0..41dc10e3 100644
--- a/src/google/protobuf/io/coded_stream_inl.h
+++ b/src/google/protobuf/io/coded_stream_inl.h
@@ -37,6 +37,7 @@
 #define GOOGLE_PROTOBUF_IO_CODED_STREAM_INL_H__
 
 #include <google/protobuf/io/coded_stream.h>
+#include <google/protobuf/io/zero_copy_stream_impl_lite.h>
 #include <string>
 #include <google/protobuf/stubs/stl_util.h>
 
@@ -53,7 +54,7 @@ inline bool CodedInputStream::InternalReadStringInline(string* buffer,
     // When buffer is empty, string_as_array(buffer) will return NULL but memcpy
     // requires non-NULL pointers even when size is 0. Hench this check.
     if (size > 0) {
-      memcpy(string_as_array(buffer), buffer_, size);
+      memcpy(mutable_string_data(buffer), buffer_, size);
       Advance(size);
     }
     return true;