Skip to content

fix: ensure variables are initialized before goto #553

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

Open
wants to merge 1 commit into
base: v1.6
Choose a base branch
from
Open

fix: ensure variables are initialized before goto #553

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 5 additions & 2 deletions src/iec61850/client/client_goose_control.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -973,6 +973,9 @@ IedConnection_setGoCBValuesAsync(IedConnection self, IedClientError* error, Clie
char domainId[65];
char itemId[130];

LinkedList itemIds = NULL;
LinkedList values = NULL;

if (MmsMapping_getMmsDomainFromObjectReference(goCB->objectReference, domainId) == NULL)
{
*error = IED_ERROR_OBJECT_REFERENCE_INVALID;;
Expand Down Expand Up @@ -1006,8 +1009,8 @@ IedConnection_setGoCBValuesAsync(IedConnection self, IedClientError* error, Clie
int itemIdLen = strlen(itemId);

/* create the list of requested itemIds references */
LinkedList itemIds = LinkedList_create();
LinkedList values = LinkedList_create();
itemIds = LinkedList_create();
values = LinkedList_create();

/* add rGoEna as last element */
if (parametersMask & GOCB_ELEMENT_GO_ID)
Expand Down
7 changes: 4 additions & 3 deletions src/iec61850/server/model/config_file_parser.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,6 +223,10 @@ setValue(char* lineBuffer, DataAttribute* dataAttribute)
IedModel*
ConfigFileParser_createModelFromConfigFile(FileHandle fileHandle)
{
IedModel* model = NULL;
int indendation = 0;
int currentLine = 0;

uint8_t* lineBuffer = (uint8_t*)GLOBAL_MALLOC(READ_BUFFER_MAX_SIZE);

if (lineBuffer == NULL)
Expand All @@ -231,11 +235,9 @@ ConfigFileParser_createModelFromConfigFile(FileHandle fileHandle)
int bytesRead = 1;

bool stateInModel = false;
int indendation = 0;
bool inArray = false;
bool inArrayElement = false;

IedModel* model = NULL;
LogicalDevice* currentLD = NULL;
LogicalNode* currentLN = NULL;
ModelNode* currentModelNode = NULL;
Expand All @@ -248,7 +250,6 @@ ConfigFileParser_createModelFromConfigFile(FileHandle fileHandle)
char nameString2[130];
char nameString3[130];

int currentLine = 0;

while (bytesRead > 0)
{
Expand Down