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

Fix crash on startup

Browse Source 
The Avro file was initialized in the wrong order and uninitialized values
were used.
This commit is contained in:
Markus Mäkelä
2017-01-27 12:55:07 +02:00
parent 8da655b7cb
commit 81b9d51aab
1 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
avro/maxavro_file.c
View File

@ -190,25 +190,35 @@ MAXAVRO_FILE* maxavro_file_open(const char* filename)
MAXAVRO_FILE* avrofile = calloc(1, sizeof(MAXAVRO_FILE)); MAXAVRO_FILE* avrofile = calloc(1, sizeof(MAXAVRO_FILE));
char *my_filename = strdup(filename); char *my_filename = strdup(filename);
char *schema = read_schema(avrofile);
if (avrofile && my_filename && schema) if (avrofile && my_filename)
{ {
avrofile->file = file; avrofile->file = file;
avrofile->filename = my_filename; avrofile->filename = my_filename;
avrofile->schema = maxavro_schema_alloc(schema);
avrofile->last_error = MAXAVRO_ERR_NONE; avrofile->last_error = MAXAVRO_ERR_NONE;
if (avrofile->schema && char *schema = read_schema(avrofile);
maxavro_read_sync(file, avrofile->sync) &&
maxavro_read_datablock_start(avrofile)) if (schema)
{ {
avrofile->header_end_pos = avrofile->block_start_pos; avrofile->schema = maxavro_schema_alloc(schema);
if (avrofile->schema &&
maxavro_read_sync(file, avrofile->sync) &&
maxavro_read_datablock_start(avrofile))
{
avrofile->header_end_pos = avrofile->block_start_pos;
}
else
{
MXS_ERROR("Failed to initialize avrofile.");
maxavro_schema_free(avrofile->schema);
error = true;
}
free(schema);
} }
else else
{ {
MXS_ERROR("Failed to initialize avrofile.");
maxavro_schema_free(avrofile->schema);
error = true; error = true;
} }
} }
@ -225,8 +235,6 @@ MAXAVRO_FILE* maxavro_file_open(const char* filename)
avrofile = NULL; avrofile = NULL;
} }
free(schema);
return avrofile; return avrofile;
} }