Skip to content

[DXFC-272] CandleWebservice data retrievement -- Access violation exception #80

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

[DXFC-272] CandleWebservice data retrievement -- Access violation exception #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fd455d4
Add functions for lock records_list
stdcion Jan 18, 2022
b1d2be8
Add call dx_lock_records_list in context working with records_list
stdcion Jan 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions src/DataStructures.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -592,6 +592,16 @@ int dx_validate_record_id(void* context, dx_record_id_t record_id) {

/* -------------------------------------------------------------------------- */

void dx_lock_records_list(void* context) {
dx_data_structures_connection_context_t* dscc = CTX(context);
dx_mutex_lock(&dscc->guard_records_list);
}

void dx_unlock_records_list(void* context) {
dx_data_structures_connection_context_t* dscc = CTX(context);
dx_mutex_unlock(&dscc->guard_records_list);
}

/*
* Returns pointer to record data.
* Don't modify any field of struct and don't free this resources.
Expand Down
7 changes: 7 additions & 0 deletions src/DataStructures.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,13 @@ typedef struct {
dx_record_id_t dx_get_record_id(void* context, dxf_int_t server_record_id);
int dx_assign_server_record_id(void* context, dx_record_id_t record_id, dxf_int_t server_record_id);

/*
* Need to lock before calling dx_get_record_by_id and
* when working with dx_record_item_t*.
*/
void dx_lock_records_list(void* context);
void dx_unlock_records_list(void* context);

/*
* Returns pointer to record data.
* Don't modify any field of struct and don't free this resources.
Expand Down
33 changes: 29 additions & 4 deletions src/ServerMessageProcessor.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1123,16 +1123,20 @@ int dx_process_data_message (dx_server_msg_proc_connection_context_t* context) {
dx_record_params_t record_params;
dxf_event_params_t event_params;

dx_lock_records_list(context->dscc);
CHECKED_CALL_1(dx_read_symbol, context);

if (context->last_symbol == NULL && !dx_decode_symbol_name(context->last_cipher, (dxf_const_string_t*)&context->last_symbol)) {
dx_unlock_records_list(context->dscc);

return false;
}

dxf_int_t server_record_id;
{
if (!dx_read_compact_int(context->bicc, &server_record_id)) {
dx_free_buffers(context->rbcc);
dx_unlock_records_list(context->dscc);

return false;
}
Expand All @@ -1143,36 +1147,46 @@ int dx_process_data_message (dx_server_msg_proc_connection_context_t* context) {
if (record_id < 0) {
dx_free_buffers(context->rbcc);
dx_logging_info(L"Not supported record from server (id=%d)", server_record_id);
dx_unlock_records_list(context->dscc);

return dx_set_error_code(dx_pec_record_not_supported);
}

record_digest = dx_get_record_digest(context, record_id);
if (record_digest == NULL) {
dx_free_buffers(context->rbcc);
dx_unlock_records_list(context->dscc);

return dx_set_error_code(dx_ec_invalid_func_param_internal);
}
if (!record_digest->in_sync_with_server) {
dx_free_buffers(context->rbcc);
dx_unlock_records_list(context->dscc);

return dx_set_error_code(dx_pec_record_description_not_received);
}

record_info = dx_get_record_by_id(context->dscc, record_id);
if (record_info == NULL)
if (record_info == NULL) {
dx_unlock_records_list(context->dscc);

return false;
}

record_buffer = g_buffer_managers[record_info->info_id].record_getter(context->rbcc, 0);
suffix = dx_string_length(record_info->suffix) > 0 ? record_info->suffix : NULL;

if (record_buffer == NULL) {
dx_free_buffers(context->rbcc);
dx_unlock_records_list(context->dscc);

return false;
}


if (!dx_read_records(context, record_id, record_buffer)) {
dx_free_buffers(context->rbcc);
dx_unlock_records_list(context->dscc);

return false;
}
Expand All @@ -1194,11 +1208,13 @@ int dx_process_data_message (dx_server_msg_proc_connection_context_t* context) {
g_buffer_managers[record_info->info_id].record_buffer_getter(context->rbcc))) {

dx_free_buffers(context->rbcc);
dx_unlock_records_list(context->dscc);

return false;
}

dx_free_buffers(context->rbcc);
dx_unlock_records_list(context->dscc);
}

return true;
Expand Down Expand Up @@ -1253,6 +1269,7 @@ int dx_process_describe_records (dx_server_msg_proc_connection_context_t* contex
return dx_set_error_code(dx_pec_record_info_corrupted);
}

dx_lock_records_list(context->dscc);
dx_record_id_t local_record_id = dx_get_record_id_by_name(context->dscc, record_name);

dx_free(record_name);
Expand All @@ -1263,25 +1280,33 @@ int dx_process_describe_records (dx_server_msg_proc_connection_context_t* contex
CHECKED_CALL_3(dx_assign_server_record_id, context->dscc, local_record_id, server_record_id);

record_info = dx_get_record_by_id(context->dscc, local_record_id);
if (record_info == NULL)
if (record_info == NULL) {
dx_unlock_records_list(context->dscc);

return false;
}

record_digest = dx_get_record_digest(context, local_record_id);
if (record_digest == NULL || record_digest->size < 0)
return dx_set_error_code(dx_ec_invalid_func_param_internal);
if (record_digest == NULL || record_digest->size < 0) {
dx_unlock_records_list(context->dscc);

return dx_set_error_code(dx_ec_invalid_func_param_internal);
}
if (record_digest->elements != NULL) {
dx_clear_record_digest(record_digest);
}

/* a generous memory allocation, to allow the maximum possible amount of pointers to be stored,
but the overhead is insignificant */
if ((record_digest->elements = dx_calloc(server_field_count + record_info->field_count, sizeof(dx_field_digest_ptr_t))) == NULL) {
dx_unlock_records_list(context->dscc);

return false;
}
}

CHECKED_CALL_5(dx_fill_record_digest, context, local_record_id, record_info, server_field_count, record_digest);
dx_unlock_records_list(context->dscc);
}

return true;
Expand Down