From 9eca4ede3d6a67ae610eaf88e946fc1128a32bc0 Mon Sep 17 00:00:00 2001
From: Tomasz Iwanek <t.iwanek@samsung.com>
Date: Fri, 11 Mar 2016 15:52:20 +0100
Subject: [PATCH] Fix formatting/double free()

manifest->tep_name is freed in pkgmgr.

Change-Id: Ic6720169d01262fb0089a90759d072d448af9bbc
---
 src/common/step/step_parse_manifest.cc | 2 +-
 src/common/utils/base64.cc             | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/common/step/step_parse_manifest.cc b/src/common/step/step_parse_manifest.cc
index acab4a5..2cb8e09 100644
--- a/src/common/step/step_parse_manifest.cc
+++ b/src/common/step/step_parse_manifest.cc
@@ -806,7 +806,7 @@ Step::Status StepParseManifest::process() {
   }
 
   if (!context_->tep_path.get().empty())
-    manifest->tep_name = (char *)context_->tep_path.get().c_str();
+    manifest->tep_name = strdup(context_->tep_path.get().c_str());
 
   // write pkgid for recovery file
   if (context_->recovery_info.get().recovery_file) {
diff --git a/src/common/utils/base64.cc b/src/common/utils/base64.cc
index 1e1f08d..840f506 100644
--- a/src/common/utils/base64.cc
+++ b/src/common/utils/base64.cc
@@ -7,6 +7,7 @@
 #include <boost/archive/iterators/base64_from_binary.hpp>
 #include <boost/archive/iterators/transform_width.hpp>
 
+#include <algorithm>
 #include <sstream>
 #include <string>
 
-- 
2.7.4