Fix insmod module size
read_file() used to append a new line character to the end of the buffer it returns, because parse_config() isn't able to cope with input that's not '\n'-terminated. Fix read_file() to be less insane, and push the workarounds into the parse_config() callers. Longer term we should rewrite parse_config(). Change-Id: Ie9d9a7adcd33b66621726aef20c4b8cc51c08be7
This commit is contained in:
parent
7297278ade
commit
eaa3b4ec6f
|
@ -57,16 +57,13 @@ extern "C" int init_module(void *, unsigned long, const char *);
|
|||
|
||||
static int insmod(const char *filename, char *options)
|
||||
{
|
||||
std::string module;
|
||||
char filename_val[PROP_VALUE_MAX];
|
||||
int ret;
|
||||
|
||||
ret = expand_props(filename_val, filename, sizeof(filename_val));
|
||||
if (ret) {
|
||||
if (expand_props(filename_val, filename, sizeof(filename_val)) == -1) {
|
||||
ERROR("insmod: cannot expand '%s'\n", filename);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
std::string module;
|
||||
if (!read_file(filename_val, &module)) {
|
||||
return -1;
|
||||
}
|
||||
|
|
|
@ -382,13 +382,13 @@ static void parse_new_section(struct parse_state *state, int kw,
|
|||
|
||||
static void parse_config(const char *fn, const std::string& data)
|
||||
{
|
||||
struct parse_state state;
|
||||
struct listnode import_list;
|
||||
struct listnode *node;
|
||||
char *args[INIT_PARSER_MAXARGS];
|
||||
int nargs;
|
||||
|
||||
nargs = 0;
|
||||
int nargs = 0;
|
||||
|
||||
parse_state state;
|
||||
state.filename = fn;
|
||||
state.line = 0;
|
||||
state.ptr = strdup(data.c_str()); // TODO: fix this code!
|
||||
|
@ -442,6 +442,7 @@ bool init_parse_config_file(const char* path) {
|
|||
return false;
|
||||
}
|
||||
|
||||
data.push_back('\n'); // TODO: fix parse_config.
|
||||
parse_config(path, data);
|
||||
dump_parser_state();
|
||||
|
||||
|
|
|
@ -420,6 +420,7 @@ static void load_properties_from_file(const char* filename, const char* filter)
|
|||
Timer t;
|
||||
std::string data;
|
||||
if (read_file(filename, &data)) {
|
||||
data.push_back('\n');
|
||||
load_properties(&data[0], filter);
|
||||
}
|
||||
NOTICE("(Loading properties from %s took %.2fs.)\n", filename, t.duration());
|
||||
|
|
|
@ -193,10 +193,10 @@ static void parse_line(struct parse_state *state, char **args, int nargs)
|
|||
|
||||
static void parse_config(const char *fn, const std::string& data)
|
||||
{
|
||||
struct parse_state state;
|
||||
char *args[UEVENTD_PARSER_MAXARGS];
|
||||
int nargs;
|
||||
nargs = 0;
|
||||
|
||||
int nargs = 0;
|
||||
parse_state state;
|
||||
state.filename = fn;
|
||||
state.line = 1;
|
||||
state.ptr = strdup(data.c_str()); // TODO: fix this code!
|
||||
|
@ -231,6 +231,7 @@ int ueventd_parse_config_file(const char *fn)
|
|||
return -1;
|
||||
}
|
||||
|
||||
data.push_back('\n'); // TODO: fix parse_config.
|
||||
parse_config(fn, data);
|
||||
dump_parser_state();
|
||||
return 0;
|
||||
|
|
|
@ -172,9 +172,6 @@ bool read_file(const char* path, std::string* content) {
|
|||
|
||||
bool okay = android::base::ReadFdToString(fd, content);
|
||||
TEMP_FAILURE_RETRY(close(fd));
|
||||
if (okay) {
|
||||
content->append("\n", 1);
|
||||
}
|
||||
return okay;
|
||||
}
|
||||
|
||||
|
@ -460,4 +457,3 @@ std::string bytes_to_hex(const uint8_t* bytes, size_t bytes_len) {
|
|||
android::base::StringAppendF(&hex, "%02x", bytes[i]);
|
||||
return hex;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue