openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

* commit 'ba0f24c71767365ff730b763b9af257bad462809':
  init: replace strdup() in parse_config()
This commit is contained in:
Tom Cherry 2015-08-11 21:05:53 +00:00 committed by Android Git Automerger
parent dd35a30547 ba0f24c717
commit 12e77877e6
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
init/init_parser.cpp
View File

@ -315,10 +315,14 @@ static void parse_config(const char *fn, const std::string& data)
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;