gfwleak/tango-maat
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修正从tableinfo中读取旧版本plugin描述时造成的写越界

Browse Source
This commit is contained in:
zhengchao
2018-12-08 17:41:25 +06:00
parent da52d77bd9
commit ccd0cc82a4
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/entry/Maat_rule.cpp
View File

@@ -601,7 +601,7 @@ int _read_integer_arrary(char* string, int *array, int size)
} }
return i; return i;
} }
#define COLUMN_PLUGIN_DESCR_JSON 4
int read_plugin_table_description(const char* line, struct Maat_table_desc* p) int read_plugin_table_description(const char* line, struct Maat_table_desc* p)
{ {
int i=0,ret=0; int i=0,ret=0;
@@ -610,15 +610,18 @@ int read_plugin_table_description(const char* line, struct Maat_table_desc* p)
char* copy_line=NULL, *plug_info=NULL; char* copy_line=NULL, *plug_info=NULL;
struct plugin_table_desc* plugin_desc=&(p->plugin); struct plugin_table_desc* plugin_desc=&(p->plugin);
copy_line=_maat_strdup(line); copy_line=_maat_strdup(line);
ret=get_column_pos(copy_line, 4, &offset, &len); ret=get_column_pos(copy_line, COLUMN_PLUGIN_DESCR_JSON, &offset, &len);
if(i<0) if(i<0)
{ {
goto error_out; goto error_out;
} }
copy_line[offset+len+1]='\0'; if(offset+len<strlen(copy_line))
{
copy_line[offset+len+1]='\0';
}
plug_info=copy_line+offset; plug_info=copy_line+offset;
if(strlen(plug_info)<4)//For old version compatible. if(strlen(plug_info)<COLUMN_PLUGIN_DESCR_JSON)//For old version compatible.
{ {
ret=sscanf(plug_info, "%d", &(plugin_desc->valid_flag_column)); ret=sscanf(plug_info, "%d", &(plugin_desc->valid_flag_column));
if(ret==0||ret==EOF) if(ret==0||ret==EOF)