Skip to content

PS7AreaContainer bugfix #5

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
cci-rwyman wants to merge 2 commits into
base: master
Choose a base branch
from
Open

PS7AreaContainer bugfix #5

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
264c27a
PS7AreaContainer bugfix: memset was not covering the allocated array …
Jun 3, 2020
0531995
Add change log entry
cci-rwyman Sep 22, 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
11 changes: 8 additions & 3 deletions src/core/s7_server.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@
| Copyright (C) 2013, 2015 Davide Nardella |
| All rights reserved. |
|==============================================================================|
| Change Log: |
| - 2020-06-03 - Mikel Negugogor - PS7AreaContainer bugfix: memset was not |
| covering the allocated array properly, and scalar delete was |
| used instead of vector delete - change comment added on |
| 2022-09-22 by Ricky Wyman |
|==============================================================================|
| SNAP7 is free software: you can redistribute it and/or modify |
| it under the terms of the Lesser GNU General Public License as published by |
| the Free Software Foundation, either version 3 of the License, or |
Expand Down Expand Up @@ -54,7 +60,7 @@ void FillTime(PS7Time PTime)
//------------------------------------------------------------------------------
PS7AreaContainer::PS7AreaContainer(size_t size) : size(size) {
area = new PS7Area[size];
memset(area, 0, size);
memset(area, 0, size * sizeof(PS7Area));
count = 0;
limit = 0;
}
Expand Down Expand Up @@ -153,8 +159,7 @@ void PS7AreaContainer::Dispose() {
}
}
count=0;
limit=0;
delete area;
delete [] area;
}
//------------------------------------------------------------------------------
// ISO/TCP WORKER CLASS
Expand Down