Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ba0f24c7 authored by Tom Cherry's avatar Tom Cherry Committed by Android Git Automerger
Browse files

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

* commit '5573e3d8':
  init: replace strdup() in parse_config()
parents 86ec2a88 5573e3d8

init/init_parser.cpp

+5 −1
Original line number Original line Diff line number Diff line
@@ -315,10 +315,14 @@ static void parse_config(const char *fn, const std::string& data) 




    int nargs = 0;

    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;

    parse_state state;

    state.filename = fn;

    state.filename = fn;

    state.line = 0;

    state.line = 0;

    state.ptr = strdup(data.c_str());  // TODO: fix this code!

    state.ptr = &data_copy[0];

    state.nexttoken = 0;

    state.nexttoken = 0;

    state.parse_line = parse_line_no_op;

    state.parse_line = parse_line_no_op;