[Com0com-cvs] hub4com export.cpp,1.1,1.2
The virtual serial port driver for Windows.
Brought to you by:
vfrolov
From: Vyacheslav F. <vf...@us...> - 2008-08-19 16:45:30
|
Update of /cvsroot/com0com/hub4com In directory sc8-pr-cvs4.sourceforge.net:/tmp/cvs-serv1905 Modified Files: export.cpp Log Message: Added missing size setting to msg_insert_buf() Index: export.cpp =================================================================== RCS file: /cvsroot/com0com/hub4com/export.cpp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** export.cpp 26 Mar 2008 08:35:03 -0000 1.1 --- export.cpp 19 Aug 2008 16:45:27 -0000 1.2 *************** *** 20,27 **** * * $Log$ * Revision 1.1 2008/03/26 08:35:03 vfrolov * Initial revision * - * */ --- 20,29 ---- * * $Log$ + * Revision 1.2 2008/08/19 16:45:27 vfrolov + * Added missing size setting to msg_insert_buf() + * * Revision 1.1 2008/03/26 08:35:03 vfrolov * Initial revision * */ *************** *** 47,51 **** { _ASSERTE((type & HUB_MSG_UNION_TYPE_MASK) == HUB_MSG_UNION_TYPE_BUF); ! _ASSERTE(pMsg != NULL); if ((pMsg->type & HUB_MSG_UNION_TYPE_MASK) != HUB_MSG_UNION_TYPE_BUF) --- 49,55 ---- { _ASSERTE((type & HUB_MSG_UNION_TYPE_MASK) == HUB_MSG_UNION_TYPE_BUF); ! ! if (!pMsg) ! return NULL; if ((pMsg->type & HUB_MSG_UNION_TYPE_MASK) != HUB_MSG_UNION_TYPE_BUF) *************** *** 71,74 **** --- 75,79 ---- if (pPrevMsg && pPrevMsg->type == type) { BufAppend(&pPrevMsg->u.buf.pBuf, pPrevMsg->u.buf.size, pSrc, sizeSrc); + pPrevMsg->u.buf.size += sizeSrc; return pPrevMsg; } *************** *** 102,106 **** { _ASSERTE((type & HUB_MSG_UNION_TYPE_MASK) == HUB_MSG_UNION_TYPE_VAL); ! _ASSERTE(pMsg != NULL); ((HubMsg *)pMsg)->Clean(); --- 107,113 ---- { _ASSERTE((type & HUB_MSG_UNION_TYPE_MASK) == HUB_MSG_UNION_TYPE_VAL); ! ! if (!pMsg) ! return NULL; ((HubMsg *)pMsg)->Clean(); *************** *** 135,139 **** { _ASSERTE((type & HUB_MSG_UNION_TYPE_MASK) == HUB_MSG_UNION_TYPE_NONE); ! _ASSERTE(pMsg != NULL); ((HubMsg *)pMsg)->Clean(); --- 142,148 ---- { _ASSERTE((type & HUB_MSG_UNION_TYPE_MASK) == HUB_MSG_UNION_TYPE_NONE); ! ! if (!pMsg) ! return NULL; ((HubMsg *)pMsg)->Clean(); |