Skip to content

Fix: mdstcpip memory issue with jscope #2318

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

Merged
zack-vii merged 2 commits into from
Jun 1, 2021
Merged

Fix: mdstcpip memory issue with jscope #2318

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
878d2f8
Fix: mdstcpip memory issue with jscope
zack-vii Jun 1, 2021
f1d3115
given that jscope seems to be the only client that sets SupportsCompr…
zack-vii Jun 1, 2021
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
4 changes: 3 additions & 1 deletion mdstcpip/mdsip.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,12 +101,14 @@
#define Endian(c) (c & BigEndian)
#define CType(c) (c & 0x0f)
#define IsCompressed(c) (c & COMPRESSED)

// somewhat jScope only message->h.status
#ifdef NOCOMPRESSION
#define SUPPORTS_COMPRESSION 0
#else
#define SUPPORTS_COMPRESSION 0x8000
#endif
#define SupportsCompression(c) (c & SUPPORTS_COMPRESSION)
#define SupportsCompression(s) (s & SUPPORTS_COMPRESSION)

#define EVENTASTREQUEST "---EVENTAST---REQUEST---"
#define EVENTCANREQUEST "---EVENTCAN---REQUEST---"
Expand Down
4 changes: 3 additions & 1 deletion mdstcpip/mdsip_connections.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,12 +192,14 @@ typedef struct _io_routines
#define Endian(c) (c & BigEndian)
#define CType(c) (c & 0x0f)
#define IsCompressed(c) (c & COMPRESSED)

// somewhat jScope only message->h.status
#ifdef NOCOMPRESSION
#define SUPPORTS_COMPRESSION 0
#else
#define SUPPORTS_COMPRESSION 0x8000
#endif
#define SupportsCompression(c) (c & SUPPORTS_COMPRESSION)
#define SupportsCompression(s) (s & SUPPORTS_COMPRESSION)

#define FlipBytes(num, ptr) \
{ \
Expand Down
17 changes: 5 additions & 12 deletions mdstcpip/mdsipshr/ProcessMessage.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,24 +476,17 @@ static inline void convert_default(Message *m, int num, const mdsdsc_t *d, uint3
}
}

static inline int _send_response(Connection *connection, Message **message, int status, mdsdsc_t *d)
static inline int _send_response(Connection *connection, Message *message, Message **message_out, int status, mdsdsc_t *d)
{
const int client_type = connection->client_type;
const unsigned char message_id = connection->message_id;
Message *m = NULL;
int serial = STATUS_NOT_OK || (connection->descrip[0] && connection->descrip[0]->dtype == DTYPE_SERIAL);
if (!serial && SupportsCompression(client_type))
{
EMPTYXD(xd);
status = MdsSerializeDscOut(d, &xd);
MdsFreeDescriptor(d);
d = xd.pointer;
serial = 1;
}
(void)message;
if (serial && STATUS_OK && d->class == CLASS_A)
{
mdsdsc_a_t *array = (mdsdsc_a_t *)d;
*message = m = malloc(sizeof(MsgHdr) + array->arsize);
*message_out = m = malloc(sizeof(MsgHdr) + array->arsize);
memset(&m->h, 0, sizeof(MsgHdr));
m->h.msglen = sizeof(MsgHdr) + array->arsize;
m->h.client_type = client_type;
Expand All @@ -510,7 +503,7 @@ static inline int _send_response(Connection *connection, Message **message, int
uint16_t length;
uint32_t num;
uint32_t nbytes = get_nbytes(&length, &num, client_type, d);
*message = m = malloc(sizeof(MsgHdr) + nbytes);
*message_out = m = malloc(sizeof(MsgHdr) + nbytes);
memset(&m->h, 0, sizeof(MsgHdr));
m->h.msglen = sizeof(MsgHdr) + nbytes;
m->h.client_type = client_type;
Expand Down Expand Up @@ -563,7 +556,7 @@ static int send_response(Connection *connection, Message *message, const int sta
{
int status;
INIT_AND_FREE_ON_EXIT(Message *, m);
status = _send_response(connection, &m, status_in, d);
status = _send_response(connection, message, &m, status_in, d);
FREE_NOW(m);
if (STATUS_NOT_OK)
return FALSE; // no good close connection
Expand Down