Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fixed invalid read

This commit is contained in:
jsteemann 2016-09-05 12:03:43 +02:00
parent df808cd665
commit 62718e0962
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/Rest/GeneralResponse.h
View File

@ -125,12 +125,11 @@ class GeneralResponse {
// generates the response body, sets the content type; this might // generates the response body, sets the content type; this might
// throw an error // throw an error
void setPayload(VPackSlice&& slice, bool generateBody, void setPayload(VPackSlice slice, bool generateBody,
VPackOptions const& options = VPackOptions::Options::Defaults, VPackOptions const& options = VPackOptions::Options::Defaults,
bool resolveExternals = true) { bool resolveExternals = true) {
_generateBody = generateBody; _generateBody = generateBody;
auto tmp = std::move(slice); addPayload(slice, &options, resolveExternals);
addPayload(tmp, &options, resolveExternals);
} }
// Payload needs to be of type: VPackSlice const& // Payload needs to be of type: VPackSlice const&
// or VPackBuffer<uint8_t>&& // or VPackBuffer<uint8_t>&&

3
lib/Rest/HttpResponse.cpp
View File

@ -305,10 +305,11 @@ void HttpResponse::addPayloadPostHook(
VPackOptions const* options = &VPackOptions::Options::Defaults, VPackOptions const* options = &VPackOptions::Options::Defaults,
bool resolveExternals = true, bool bodySkipped = false) { bool resolveExternals = true, bool bodySkipped = false) {
VPackSlice const* slicePtr; VPackSlice const* slicePtr;
VPackSlice tmpSlice;
if (!bodySkipped) { if (!bodySkipped) {
// we have Probably resolved externals // we have Probably resolved externals
TRI_ASSERT(!_vpackPayloads.empty()); TRI_ASSERT(!_vpackPayloads.empty());
VPackSlice tmpSlice = VPackSlice(_vpackPayloads.front().data()); tmpSlice = VPackSlice(_vpackPayloads.front().data());
slicePtr = &tmpSlice; slicePtr = &tmpSlice;
} else { } else {
slicePtr = &slice; slicePtr = &slice;