hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ignore malformed .avsc files

Browse Source 
If the file name is wrong, ignore it.
This commit is contained in:
Markus Mäkelä
2019-02-01 20:45:43 +02:00
parent 6295732bee
commit 51884c4599
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
server/modules/routing/avrorouter/avro_file.cc
View File

@ -653,17 +653,30 @@ void avro_load_metadata_from_schemas(Avro* router)
for (int i = files.gl_pathc - 1; i > -1; i--) for (int i = files.gl_pathc - 1; i > -1; i--)
{ {
char* dbstart = strrchr(files.gl_pathv[i], '/'); char* dbstart = strrchr(files.gl_pathv[i], '/');
mxb_assert(dbstart);
if (!dbstart)
{
continue;
}
dbstart++; dbstart++;
char* tablestart = strchr(dbstart, '.'); char* tablestart = strchr(dbstart, '.');
mxb_assert(tablestart);
if (!tablestart)
{
continue;
}
snprintf(db, sizeof(db), "%.*s", (int)(tablestart - dbstart), dbstart); snprintf(db, sizeof(db), "%.*s", (int)(tablestart - dbstart), dbstart);
tablestart++; tablestart++;
char* versionstart = strchr(tablestart, '.'); char* versionstart = strchr(tablestart, '.');
mxb_assert(versionstart);
if (!versionstart)
{
continue;
}
snprintf(table, sizeof(table), "%.*s", (int)(versionstart - tablestart), tablestart); snprintf(table, sizeof(table), "%.*s", (int)(versionstart - tablestart), tablestart);
versionstart++; versionstart++;