[osrm] 01/04: Imported Upstream version 5.2.2+ds

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository osrm.

commit 2c822712b093c308c0073b268fdacf0a67aeffcc
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Jun 17 15:07:27 2016 +0200

    Imported Upstream version 5.2.2+ds
---
 CHANGELOG.md                   | 10 ++++++++--
 src/server/request_handler.cpp |  5 ++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 513de6c..fdde156 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,9 +1,15 @@
+# 5.2.2
+  Changes from 5.2.1
+  - Bugfixes:
+    - Buffer overrun in tile plugin response handling
+
 # 5.2.1
   Changes from 5.2.0
-  Bugfixes:
+  - Bugfixes:
     - Removed debug statement that was spamming the console
+
 # 5.2.0
-  Changes form 5.2.0 RC2
+  Changes from 5.2.0 RC2
    - Bugfixes:
      - Fixed crash when loading shared memory caused by invalid OSM IDs segment size.
      - Various small instructions handling fixes
diff --git a/src/server/request_handler.cpp b/src/server/request_handler.cpp
index 7845125..7e49b5e 100644
--- a/src/server/request_handler.cpp
+++ b/src/server/request_handler.cpp
@@ -105,11 +105,10 @@ void RequestHandler::HandleRequest(const http::request &current_request, http::r
         else
         {
             BOOST_ASSERT(result.is<std::string>());
-            current_reply.content.resize(current_reply.content.size() +
-                                         result.get<std::string>().size());
+            current_reply.content.resize(result.get<std::string>().size());
             std::copy(result.get<std::string>().cbegin(),
                       result.get<std::string>().cend(),
-                      current_reply.content.end());
+                      current_reply.content.begin());
 
             current_reply.headers.emplace_back("Content-Type", "application/x-protobuf");
         }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osrm.git