commit 9b005a328b2b5f64851552cf835f7486e3658c3f
author Tom Cherry <tomcherry@google.com> Tue Aug 11 21:05:59 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Tue Aug 11 21:05:59 2015 +0000
tree 89affd7a00b92bc130d8a057b547509398a79c77
parent 983cacea013bae69f46421c923f7dc21aafc8646
parent ba0f24c71767365ff730b763b9af257bad462809

am ba0f24c7: am 5573e3d8: Merge "init: replace strdup() in parse_config()"

* commit 'ba0f24c71767365ff730b763b9af257bad462809':
  init: replace strdup() in parse_config()

init/init_parser.cpp

diff --git a/init/init_parser.cpp b/init/init_parser.cpp
index 026439f..983eacd 100644
--- a/init/init_parser.cpp
+++ b/init/init_parser.cpp
@@ -316,10 +316,14 @@
 
     int nargs = 0;
 
+    //TODO: Use a parser with const input and remove this copy
+    std::vector<char> data_copy(data.begin(), data.end());
+    data_copy.push_back('\0');
+
     parse_state state;
     state.filename = fn;
     state.line = 0;
-    state.ptr = strdup(data.c_str());  // TODO: fix this code!
+    state.ptr = &data_copy[0];
     state.nexttoken = 0;
     state.parse_line = parse_line_no_op;